Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
e3d20dfaa5
67 changed files with 753 additions and 199 deletions
|
|
@ -9944,6 +9944,12 @@
|
|||
fingerprint = "48AD DE10 F27B AFB4 7BB0 CCAF 2D25 95A0 0D08 ACE0";
|
||||
}];
|
||||
};
|
||||
ppenguin = {
|
||||
name = "Jeroen Versteeg";
|
||||
email = "hieronymusv@gmail.com";
|
||||
github = "ppenguin";
|
||||
githubId = 17690377;
|
||||
};
|
||||
ppom = {
|
||||
name = "Paco Pompeani";
|
||||
email = "paco@ecomail.io";
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
|||
services.xserver.desktopManager.gnome.enable = true;
|
||||
services.xserver.desktopManager.gnome.debug = true;
|
||||
services.xserver.displayManager.defaultSession = "gnome-xorg";
|
||||
programs.gnome-terminal.enable = true;
|
||||
|
||||
systemd.user.services = {
|
||||
"org.gnome.Shell@x11" = {
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
|||
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
services.xserver.desktopManager.gnome.debug = true;
|
||||
programs.gnome-terminal.enable = true;
|
||||
|
||||
environment.systemPackages = [
|
||||
(pkgs.makeAutostartItem {
|
||||
|
|
|
|||
|
|
@ -8,22 +8,22 @@
|
|||
, autoPatchelfHook
|
||||
, gsettings-desktop-schemas
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pinegrow";
|
||||
version = "6.4";
|
||||
version = "6.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip";
|
||||
sha256 = "0i8sg4criimrqmz0g68b8xcwcrb362ssid5jazswpa6hhwj6s5n4";
|
||||
sha256 = "1l7cf5jgidpykaf68mzf92kywl1vxwl3fg43ibgr2rg4cnl1g82b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
unzip
|
||||
autoPatchelfHook
|
||||
wrapGAppsHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -34,6 +34,11 @@ stdenv.mkDerivation rec {
|
|||
gtk3
|
||||
];
|
||||
|
||||
wrapProgramFlags = [
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib gtk3 udev ]}"
|
||||
"--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}"
|
||||
];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
@ -57,7 +62,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
preFixup = ''
|
||||
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
|
||||
wrapGApp "$out/opt/pinegrow/PinegrowLibrary" --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
|
||||
wrapProgram "$out/opt/pinegrow/PinegrowLibrary" ''${wrapProgramFlags[@]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2673,6 +2673,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/phaazon/hop.nvim/";
|
||||
};
|
||||
|
||||
hotpot-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "hotpot.nvim";
|
||||
version = "2022-03-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rktjmp";
|
||||
repo = "hotpot.nvim";
|
||||
rev = "72704e1914648774a4fb42f57ca411d689e08ae6";
|
||||
sha256 = "1dh6i2asqrhxc1irnhr46drn8ksj7xq81m6ankvy1gj8bkc74dmp";
|
||||
};
|
||||
meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";
|
||||
};
|
||||
|
||||
i3config-vim = buildVimPluginFrom2Nix {
|
||||
pname = "i3config.vim";
|
||||
version = "2021-06-23";
|
||||
|
|
|
|||
|
|
@ -693,6 +693,7 @@ rhysd/vim-operator-surround
|
|||
RishabhRD/nvim-lsputils
|
||||
RishabhRD/popfix
|
||||
rktjmp/fwatch.nvim
|
||||
rktjmp/hotpot.nvim
|
||||
rktjmp/lush.nvim
|
||||
rmagatti/auto-session
|
||||
rmagatti/goto-preview
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloudflared";
|
||||
version = "2022.3.1";
|
||||
version = "2022.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
rev = version;
|
||||
hash = "sha256-iVg+AXSBO+caeYxUR41infCvsCTZkJTf7K0oZnOQmnY=";
|
||||
hash = "sha256-W3XA3AOzuyHlFCps2ne4Fh2X+E48inJT4QrDJLOeD5M=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -6,15 +6,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gmailctl";
|
||||
version = "0.10.0";
|
||||
version = "unstable-2022-03-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mbrt";
|
||||
repo = "gmailctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JuE8+OW+qM6tir4A25tN2GTXQIkcKVE4uKbZNSTcNlA=";
|
||||
rev = "484bb689866987580e0576165180ef06375a543f";
|
||||
sha256 = "sha256-hIoS64QEDJ1qq3KJ2H8HjgQl8SxuIo+xz7Ot8CdjjQA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-KWM20a38jZ3/a45313kxY2LaCQyiNMEdfdIV78phrBo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
|
@ -26,8 +28,6 @@ buildGoModule rec {
|
|||
--zsh <($out/bin/gmailctl completion zsh)
|
||||
'';
|
||||
|
||||
vendorSha256 = "sha256-nAczO439tRiQU9f9LbJVENJiURVRnBAInwUp699RxOY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "termius";
|
||||
version = "7.34.1";
|
||||
version = "7.36.1";
|
||||
|
||||
src = fetchurl {
|
||||
# find the latest version with
|
||||
|
|
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
|
|||
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r
|
||||
# and the sha512 with
|
||||
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_101.snap";
|
||||
sha512 = "7fdd82535fd288277b01fedde4739dc97782236fbf25372efa56114bba676c21277ed96b32a1d46ac86af19925b14935818af50985d43a1307639530db044af4";
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_107.snap";
|
||||
sha512 = "ef8514bdd0e6761a9bc7bf6b0b72d95c661905798c1507af932bd38a1e0c96713f71140b0d91454c3da5f3b97a0c8143b32918294eea2e46a7dca8faabda57e6";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
|
@ -55,15 +55,7 @@ stdenv.mkDerivation rec {
|
|||
runHook preInstall
|
||||
cd squashfs-root
|
||||
mkdir -p $out/opt/termius
|
||||
cp -r \
|
||||
icudtl.dat \
|
||||
libffmpeg.so \
|
||||
locales \
|
||||
resources \
|
||||
resources.pak \
|
||||
termius-app \
|
||||
v8_context_snapshot.bin \
|
||||
$out/opt/termius
|
||||
cp -r ./ $out/opt/termius
|
||||
|
||||
mkdir -p "$out/share/applications" "$out/share/pixmaps/termius-app.png"
|
||||
cp "${desktopItem}/share/applications/"* "$out/share/applications"
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ngspice";
|
||||
version = "34";
|
||||
version = "36";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz";
|
||||
sha256 = "sha256-ImP//GaUdUlyr3By7wHP5irHkIANrWUbwpC/yueb17U=";
|
||||
sha256 = "sha256-T4GCh++6JFNBBGY1t1eugfh5VJsyakMWtfbml6pRf4w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flex bison ];
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lima";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lima-vm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Y15oYAdq+bsG2qD/ZTqXHgkelAdQF4SnOE79gDhlNGE=";
|
||||
sha256 = "sha256-GS/mzBoVL78U7vMxkbnQfb89U640w8YdA8YhPH4Iwrc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-66CcLWG45vZwM2LVc1xsjJYyxefGEBW4fY3wo1ESQUM=";
|
||||
vendorSha256 = "sha256-funVyM0RhDzGQPyzsABzXu3ETPYJwRosqkQreGBADZc=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,28 @@
|
|||
{ lib, fetchFromGitHub, python3, python3Packages, mypy, glib, pango, pkg-config, xcbutilcursor }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, python3Packages
|
||||
, mypy
|
||||
, glib
|
||||
, pango
|
||||
, pkg-config
|
||||
, libinput
|
||||
, libxkbcommon
|
||||
, wayland
|
||||
, wlroots
|
||||
, xcbutilcursor
|
||||
}:
|
||||
|
||||
let
|
||||
unwrapped = python3Packages.buildPythonPackage rec {
|
||||
pname = "qtile";
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qtile";
|
||||
repo = "qtile";
|
||||
rev = "v${version}";
|
||||
sha256 = "TRmul3t//izJRdViTvxFz29JZeGYsWc7WsJjagQ35nw=";
|
||||
sha256 = "3QCI1TZIh1LcWuklVQkqgR1MQphi6CzZKc1UZcytV0k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -48,6 +61,13 @@ let
|
|||
xkbcommon
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libinput
|
||||
wayland
|
||||
wlroots
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
# for `qtile check`, needs `stubtest` and `mypy` commands
|
||||
makeWrapperArgs = [
|
||||
"--suffix PATH : ${lib.makeBinPath [ mypy ]}"
|
||||
|
|
|
|||
|
|
@ -61,6 +61,16 @@ super: lib.trivial.pipe super [
|
|||
'';
|
||||
}))
|
||||
|
||||
(patchExtension "screen-autorotate@kosmospredanie.yandex.ru" (old: {
|
||||
# Requires gjs
|
||||
# https://github.com/NixOS/nixpkgs/issues/164865
|
||||
postPatch = ''
|
||||
for file in *.js; do
|
||||
substituteInPlace $file --replace "gjs" "${gjs}/bin/gjs"
|
||||
done
|
||||
'';
|
||||
}))
|
||||
|
||||
(patchExtension "shell-volume-mixer@derhofbauer.at" (old: {
|
||||
patches = [
|
||||
(substituteAll {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm
|
||||
, alsa-lib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
|
||||
, libssh, libtheora, libva, libdrm, libvorbis, libvpx, xz, libpulseaudio, soxr
|
||||
, libssh, libtheora, libva, libdrm, libvorbis, libvpx, xz, soxr
|
||||
, x264, x265, xvidcore, zimg, zlib, libopus, speex, nv-codec-headers, dav1d
|
||||
, srt ? null
|
||||
, openglSupport ? false, libGLU ? null, libGL ? null
|
||||
|
|
@ -19,7 +19,10 @@
|
|||
, Cocoa, darwinFrameworks ? [ Cocoa ]
|
||||
# Inherit generics
|
||||
, branch, sha256, version, patches ? [], knownVulnerabilities ? []
|
||||
, doCheck ? true, ...
|
||||
, doCheck ? true
|
||||
, pulseaudioSupport ? stdenv.isLinux
|
||||
, libpulseaudio
|
||||
, ...
|
||||
}:
|
||||
|
||||
/* Maintainer notes:
|
||||
|
|
@ -149,7 +152,7 @@ stdenv.mkDerivation rec {
|
|||
(ifMinVer "2.2" (enableFeature openglSupport "opengl"))
|
||||
(ifMinVer "4.2" (enableFeature libmfxSupport "libmfx"))
|
||||
(ifMinVer "4.2" (enableFeature libaomSupport "libaom"))
|
||||
(disDarwinOrArmFix (ifMinVer "0.9" "--enable-libpulse") "0.9" "--disable-libpulse")
|
||||
(disDarwinOrArmFix (ifMinVer "0.9" (lib.optionalString pulseaudioSupport "--enable-libpulse")) "0.9" "--disable-libpulse")
|
||||
(ifMinVer "2.5" (if sdlSupport && reqMin "3.2" then "--enable-sdl2" else if sdlSupport then "--enable-sdl" else null)) # autodetected before 2.5, SDL1 support removed in 3.2 for SDL2
|
||||
(ifMinVer "1.2" "--enable-libsoxr")
|
||||
"--enable-libx264"
|
||||
|
|
@ -182,7 +185,7 @@ stdenv.mkDerivation rec {
|
|||
++ optional libmfxSupport intel-media-sdk
|
||||
++ optional libaomSupport libaom
|
||||
++ optional vpxSupport libvpx
|
||||
++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM
|
||||
++ optionals (!isDarwin && !isAarch32 && pulseaudioSupport) [ libpulseaudio ] # Need to be fixed on Darwin and ARM
|
||||
++ optional ((isLinux || isFreeBSD) && !isAarch32) libva
|
||||
++ optional ((isLinux || isFreeBSD) && !isAarch32) libdrm
|
||||
++ optional isLinux alsa-lib
|
||||
|
|
|
|||
|
|
@ -21,6 +21,12 @@
|
|||
, gtk-doc
|
||||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_43
|
||||
# for passthru.tests
|
||||
, gimp
|
||||
, gtk3
|
||||
, gtk4
|
||||
, mapnik
|
||||
, qt5
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -99,6 +105,11 @@ stdenv.mkDerivation {
|
|||
''}
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit gimp gtk3 gtk4 mapnik;
|
||||
inherit (qt5) qtbase;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "An OpenType text shaping engine";
|
||||
homepage = "https://harfbuzz.github.io/";
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-gmmlib";
|
||||
version = "22.1.1";
|
||||
version = "22.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "gmmlib";
|
||||
rev = "intel-gmmlib-${version}";
|
||||
sha256 = "sha256-eU6ztYYcFPeADFBqmDFqyqVGlxdTV1N5pnIg6rjoALg=";
|
||||
sha256 = "sha256-5exS0B2iRbmFkKtoHzL4NnZ7L3DaukthUYkoj2tpZuE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -6,6 +6,9 @@
|
|||
# builds fine on windows, but libarchive has trouble linking windows
|
||||
# things it depends on for some reason.
|
||||
xarSupport ? stdenv.hostPlatform.isUnix,
|
||||
|
||||
# for passthru.tests
|
||||
cmake, nix, samba
|
||||
}:
|
||||
|
||||
assert xarSupport -> libxml2 != null;
|
||||
|
|
@ -49,6 +52,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests = {
|
||||
inherit cmake nix samba;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Multi-format archive and compression library";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -9,6 +9,16 @@
|
|||
, libjpeg
|
||||
, xz
|
||||
, zlib
|
||||
|
||||
# for passthru.tests
|
||||
, libgeotiff
|
||||
, python3Packages
|
||||
, imagemagick
|
||||
, graphicsmagick
|
||||
, gdal
|
||||
, openimageio
|
||||
, freeimage
|
||||
, imlib
|
||||
}:
|
||||
|
||||
#FIXME: fix aarch64-darwin build and get rid of ./aarch64-darwin.nix
|
||||
|
|
@ -69,6 +79,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests = {
|
||||
inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage imlib;
|
||||
inherit (python3Packages) pillow imread;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library and utilities for working with the TIFF image file format";
|
||||
homepage = "https://libtiff.gitlab.io/libtiff";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "printbox";
|
||||
version = "0.6";
|
||||
version = "0.6.1";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
|
|
@ -12,7 +12,7 @@ buildDunePackage rec {
|
|||
owner = "c-cube";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:0vqp8j1vp8h8par699nnh31hnikzh6pqn07lqyxw65axqy3sc9dp";
|
||||
sha256 = "sha256-7u2ThRhM3vW4ItcFsK4ycgcaW0JcQOFoZZRq2kqbl+k=";
|
||||
};
|
||||
|
||||
checkInputs = [ mdx.bin ];
|
||||
|
|
|
|||
|
|
@ -2,8 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "sawja";
|
||||
version = "1.5.10";
|
||||
webpage = "http://sawja.inria.fr/";
|
||||
version = "1.5.11";
|
||||
in
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.07"
|
||||
|
|
@ -20,7 +19,7 @@ stdenv.mkDerivation {
|
|||
owner = "javalib-team";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256:0k51rscs9mdgpg3qn4cahql5ncdvlb207m015hr8v6r1vfgn0ddq";
|
||||
sha256 = "sha256-1aKkRZDuLJLmDhUC1FXnn4QrgXaTyAbnXfTOAdnKgs8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which ocaml findlib ];
|
||||
|
|
@ -42,7 +41,7 @@ stdenv.mkDerivation {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs";
|
||||
homepage = webpage;
|
||||
homepage = "http://sawja.inria.fr/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "tcpip";
|
||||
version = "7.0.1";
|
||||
version = "7.1.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
|
||||
sha256 = "0gqj2s9sk3a7f4yavx423a569fvxsrgm0wg58biiv16v37xjaymp";
|
||||
sha256 = "sha256-4nd2OVZa4w22I4bgglnS8lrNfjTk40PL5n6Oh6n+osw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||
version = "1.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://erratique.ch/software/${pname}/releases/${pname}${version}.tbz";
|
||||
url = "https://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
|
||||
sha256 = "sha256-h3KlYT0ecCmM4U3zMkGjaF8h5O9r20zwP+mF+x7KBWg=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fabric";
|
||||
version = "2.6.0";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "47f184b070272796fd2f9f0436799e18f2ccba4ee8ee587796fca192acd46cd2";
|
||||
sha256 = "sha256-C/eXpoxLOJcg3E3WGBSXpYxB7XYuKD2ePBsBSLMqmv8=";
|
||||
};
|
||||
|
||||
# only relevant to python < 3.4
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, tokenize-rt
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "add-trailing-comma";
|
||||
version = "2.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asottile";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "RBOL4mM9VciHHNmCTlRBIoXqeln19MKYxgv9p6GCNvU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
tokenize-rt
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"add_trailing_comma"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool (and pre-commit hook) to automatically add trailing commas to calls and literals";
|
||||
homepage = "https://github.com/asottile/add-trailing-comma";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gador ];
|
||||
};
|
||||
}
|
||||
71
pkgs/development/python-modules/ansible-later/default.nix
Normal file
71
pkgs/development/python-modules/ansible-later/default.nix
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
{ buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
|
||||
# pythonPackages
|
||||
, anyconfig
|
||||
, appdirs
|
||||
, colorama
|
||||
, flake8
|
||||
, jsonschema
|
||||
, nested-lookup
|
||||
, poetry-core
|
||||
, python-json-logger
|
||||
, pyyaml
|
||||
, toolz
|
||||
, unidiff
|
||||
, yamllint
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-later";
|
||||
version = "2.0.6";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thegeeklab";
|
||||
repo = "ansible-later";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vg9ryzl9ZeOGuFLL1yeJ3vGNPdo3ONmCQozY6DK6miY=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
rm $out/lib/python*/site-packages/LICENSE
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'PyYAML = "6.0"' 'PyYAML = "*"' \
|
||||
--replace 'unidiff = "0.7.3"' 'unidiff = "*"' \
|
||||
--replace 'jsonschema = "4.4.0"' 'jsonschema = "*"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
anyconfig
|
||||
appdirs
|
||||
colorama
|
||||
flake8
|
||||
jsonschema
|
||||
nested-lookup
|
||||
python-json-logger
|
||||
pyyaml
|
||||
toolz
|
||||
unidiff
|
||||
yamllint
|
||||
];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "ansiblelater" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Another best practice scanner for Ansible roles and playbooks";
|
||||
homepage = "https://github.com/thegeeklab/ansible-later";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ tboerger ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "etuples";
|
||||
version = "0.3.4";
|
||||
version = "0.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pythological";
|
||||
repo = "etuples";
|
||||
rev = "35d760ceb64ec318f302a6e4d3a4a80feda97a9e";
|
||||
sha256 = "sha256-CXD8MhsdWYAcG5WDVTT/A2HDtiO1xfQbrwlYVnxXpBU=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gJNxrO2d/eF4t3bBlz/BwF+9eT1nKrVrTP3F6/dEN00=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
, fetchPypi
|
||||
, pythonOlder
|
||||
, argcomplete
|
||||
, debugpy
|
||||
, ipython
|
||||
, jupyter-client
|
||||
, tornado
|
||||
|
|
@ -20,8 +19,13 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-+VBwot/TFH+KsZ8Y7kZzMxCBN1hZN0XgfsGPsItAnx0=";
|
||||
};
|
||||
|
||||
# debugpy is optional, see https://github.com/ipython/ipykernel/pull/767
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'debugpy>=1.0.0,<2.0'," ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
debugpy
|
||||
ipython
|
||||
jupyter-client
|
||||
tornado
|
||||
|
|
|
|||
|
|
@ -44,19 +44,15 @@ let
|
|||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "OpenSfM";
|
||||
version = "0.5.2";
|
||||
version = "unstable-2022-03-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mapillary";
|
||||
repo = pname;
|
||||
rev = "79aa4bdd8bd08dc0cd9e3086d170cedb29ac9760";
|
||||
sha256 = "sha256-dHBrkYwLA1OUxUSoe7DysyeEm9Yy70tIJvAsXivdjrM=";
|
||||
rev = "536b6e1414c8a93f0815dbae85d03749daaa5432";
|
||||
sha256 = "Nfl20dFF2PKOkIvHbRxu1naU+qhz4whLXJvX5c5Wnwo=";
|
||||
};
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mapillary/OpenSfM/pull/872/commits/a76671db11038f3f4dfe5b8f17582fb447ad7dd5.patch";
|
||||
sha256 = "sha256-4nizQiZIjucdydOLrETvs1xdV3qiYqAQ7x1HECKvlHs=";
|
||||
})
|
||||
./0002-cmake-find-system-distributed-gtest.patch
|
||||
./0003-cmake-use-system-pybind11.patch
|
||||
./0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch
|
||||
|
|
@ -121,6 +117,7 @@ buildPythonPackage rec {
|
|||
meta = {
|
||||
maintainers = [ lib.maintainers.SomeoneSerge ];
|
||||
license = lib.licenses.bsd2;
|
||||
changelog = "https://github.com/mapillary/OpenSfM/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Open source Structure-from-Motion pipeline from Mapillary";
|
||||
homepage = "https://opensfm.org/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pybullet";
|
||||
version = "3.2.0";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "df02fb0ab74a6e7c4e1d7a3e2ffd7e4760a30cdeccb9fa6dd19f334122ec00f2";
|
||||
sha256 = "sha256-Rtq2RZ2CjgS2YbuA4BS8+xPJ8bpAwCLl6xEy78/guOA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,30 +1,46 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, python, requests, six }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, httpx
|
||||
, pytestCheckHook
|
||||
, python
|
||||
, pythonOlder
|
||||
, requests
|
||||
, six
|
||||
}:
|
||||
|
||||
with lib;
|
||||
buildPythonPackage rec {
|
||||
pname = "requests-aws4auth";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c0883346ce30b5018903a67da88df72f73ff06e1a320845bba9cd85e811ba0ba";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tedder";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/SqU/ojP9I4JXzR0c5tLzxx9UyNaVsON7LG/dbdeiH0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests six ];
|
||||
propagatedBuildInputs = [
|
||||
httpx
|
||||
requests
|
||||
six
|
||||
];
|
||||
|
||||
# pypi package no longer contains tests
|
||||
doCheck = false;
|
||||
checkPhase = ''
|
||||
cd requests_aws4auth
|
||||
${python.interpreter} test/requests_aws4auth_test.py
|
||||
'';
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "requests_aws4auth" ];
|
||||
pythonImportsCheck = [
|
||||
"requests_aws4auth"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Amazon Web Services version 4 authentication for the Python Requests library.";
|
||||
meta = with lib; {
|
||||
description = "Amazon Web Services version 4 authentication for the Python Requests library";
|
||||
homepage = "https://github.com/sam-washington/requests-aws4auth";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.basvandijk ];
|
||||
maintainers = with maintainers; [ basvandijk ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.82.1";
|
||||
version = "0.92.2";
|
||||
pname = "jbang";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
|
||||
sha256 = "sha256-C2zsIJvna7iqcaCM4phJonbA9TALL89rACms5II9hhU=";
|
||||
sha256 = "0gbdbjyyh2if3yfmwfd6d3yq8r25inhw7n44jbjw1pdqb6gk44z1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
|
|||
installPhase = ''
|
||||
runHook preInstall
|
||||
rm bin/jbang.{cmd,ps1}
|
||||
rmdir tmp
|
||||
cp -r . $out
|
||||
wrapProgram $out/bin/jbang \
|
||||
--set JAVA_HOME ${jdk} \
|
||||
|
|
|
|||
2
pkgs/development/tools/license_finder/Gemfile
Normal file
2
pkgs/development/tools/license_finder/Gemfile
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
source 'https://rubygems.org'
|
||||
gem 'license_finder'
|
||||
26
pkgs/development/tools/license_finder/Gemfile.lock
Normal file
26
pkgs/development/tools/license_finder/Gemfile.lock
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
license_finder (7.0.1)
|
||||
bundler
|
||||
rubyzip (>= 1, < 3)
|
||||
thor (~> 1.2)
|
||||
tomlrb (>= 1.3, < 2.1)
|
||||
with_env (= 1.1.0)
|
||||
xml-simple (~> 1.1.9)
|
||||
rexml (3.2.5)
|
||||
rubyzip (2.3.2)
|
||||
thor (1.2.1)
|
||||
tomlrb (2.0.1)
|
||||
with_env (1.1.0)
|
||||
xml-simple (1.1.9)
|
||||
rexml
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
license_finder
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
19
pkgs/development/tools/license_finder/default.nix
Normal file
19
pkgs/development/tools/license_finder/default.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{ lib, bundlerEnv, bundlerUpdateScript, ruby }:
|
||||
|
||||
bundlerEnv {
|
||||
pname = "license_finder";
|
||||
version = "7.0.1";
|
||||
|
||||
inherit ruby;
|
||||
gemdir = ./.;
|
||||
|
||||
passthru.updateScript = bundlerUpdateScript "license_finder";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Find licenses for your project's dependencies";
|
||||
homepage = "https://github.com/pivotal/licensefinder";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
74
pkgs/development/tools/license_finder/gemset.nix
Normal file
74
pkgs/development/tools/license_finder/gemset.nix
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
{
|
||||
license_finder = {
|
||||
dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0sig4ifxzvcz3fwjnz93dpv61v6sxpmlknj5f8n112ragrbcj8hb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.1";
|
||||
};
|
||||
rexml = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.5";
|
||||
};
|
||||
rubyzip = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.2";
|
||||
};
|
||||
thor = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.1";
|
||||
};
|
||||
tomlrb = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0a83cb5xpyzlr651d46rk5xgq37s46hs9nfqy9baawzs31hm9k2g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.1";
|
||||
};
|
||||
with_env = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
};
|
||||
xml-simple = {
|
||||
dependencies = ["rexml"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0pb9plyl71mdbjr4kllfy53qx6g68ryxblmnq9dilvy837jk24fj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.9";
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-nextest";
|
||||
version = "0.9.11";
|
||||
version = "0.9.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextest-rs";
|
||||
repo = "nextest";
|
||||
rev = "cargo-nextest-${version}";
|
||||
sha256 = "sha256-aXGXn6kxw37v0fn2SPQnGCdTg1CFJK03OIAgFjvaxpc=";
|
||||
sha256 = "sha256-E3/AgzLvjlMfbmvAOYx4V1/1wSLKlFo61tGv79ow7XY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-zuPWF2sxVmlhSMy70yhRZEV6dgL2W8AGkYRbnbJdMpQ=";
|
||||
cargoSha256 = "sha256-zrYmZG3VAneanHaNoG3txv7LbKCYvqIf60g1W7CmPG8=";
|
||||
|
||||
cargoTestFlags = [ # TODO: investigate some more why these tests fail in nix
|
||||
"--"
|
||||
|
|
|
|||
|
|
@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "A project for generating C bindings from Rust code";
|
||||
homepage = "https://github.com/eqrion/cbindgen";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "wails";
|
||||
version = "2.0.0-beta.33";
|
||||
version = "2.0.0-beta.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wailsapp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-efxOL/FllToum0P4JyAJt0fbrznTFYh7czTWpZu3uk0=";
|
||||
sha256 = "sha256-dsDruZSmr8qSNpX8L27tLpNxvdSkc2mfNQLRxN9AnCg=";
|
||||
} + "/v2";
|
||||
|
||||
vendorSha256 = "sha256-qPMVsvud2L7hpXUOfYYMiO32JXff8ZZC34EsxFoSJ0g=";
|
||||
vendorSha256 = "sha256-OaSPpCb2VxMGlkUIg3fyEJhjz256amEfXBX+5WMY3a0=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.0.306";
|
||||
version = "0.0.308";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Nnt4Gj+/DbP3tAne99u15GYT099lBTM16O4r0QMuRXA=";
|
||||
sha256 = "sha256-Di0egdreY3c6kulcvAl4dFfYpIuMocQzHiFW48kJ6u4=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
@ -17,7 +17,7 @@ buildGoModule rec {
|
|||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-n5LZ6WP1LxnhdDKIm8oc3CVFD2jXUEQ/scbOLtMTWQk=";
|
||||
vendorSha256 = "sha256-2goglOmcUud9KT5accn/AMe4xEgRN2Ep1qMfQHtlI+Q=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2020.3.11";
|
||||
version = "2020.3.12";
|
||||
shortVersion = builtins.substring 0 6 version;
|
||||
data = stdenv.mkDerivation rec {
|
||||
pname = "flightgear-data";
|
||||
|
|
@ -14,7 +14,7 @@ let
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.txz";
|
||||
sha256 = "sha256-Ej8VGywPQiDw3VXodcpXpOw4qU9x+MBMWMrqwHfitVg=";
|
||||
sha256 = "sha256-gCsW9e8IuXwmJfAfxJ/nORF5W/PwCka+O8Chwm26OnY=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-/icGx3B+pzq8URR3PeRfKYYasPj1NWVq8EKO0EnKSpc=";
|
||||
sha256 = "sha256-wPeZIAiGU0zPBkzeBCO1xEgm+iZd/hWvBEr2ZcsX0Qc=";
|
||||
};
|
||||
|
||||
# Of all the files in the source and data archives, there doesn't seem to be
|
||||
|
|
|
|||
186
pkgs/misc/dxvk/darwin-thread-primitives.patch
Normal file
186
pkgs/misc/dxvk/darwin-thread-primitives.patch
Normal file
|
|
@ -0,0 +1,186 @@
|
|||
diff --git a/src/util/thread.h b/src/util/thread.h
|
||||
index 28aeca8a..db5c9913 100644
|
||||
--- a/src/util/thread.h
|
||||
+++ b/src/util/thread.h
|
||||
@@ -149,178 +149,8 @@ namespace dxvk {
|
||||
}
|
||||
}
|
||||
|
||||
-
|
||||
- /**
|
||||
- * \brief SRW-based mutex implementation
|
||||
- *
|
||||
- * Drop-in replacement for \c std::mutex that uses Win32
|
||||
- * SRW locks, which are implemented with \c futex in wine.
|
||||
- */
|
||||
- class mutex {
|
||||
-
|
||||
- public:
|
||||
-
|
||||
- using native_handle_type = PSRWLOCK;
|
||||
-
|
||||
- mutex() { }
|
||||
-
|
||||
- mutex(const mutex&) = delete;
|
||||
- mutex& operator = (const mutex&) = delete;
|
||||
-
|
||||
- void lock() {
|
||||
- AcquireSRWLockExclusive(&m_lock);
|
||||
- }
|
||||
-
|
||||
- void unlock() {
|
||||
- ReleaseSRWLockExclusive(&m_lock);
|
||||
- }
|
||||
-
|
||||
- bool try_lock() {
|
||||
- return TryAcquireSRWLockExclusive(&m_lock);
|
||||
- }
|
||||
-
|
||||
- native_handle_type native_handle() {
|
||||
- return &m_lock;
|
||||
- }
|
||||
-
|
||||
- private:
|
||||
-
|
||||
- SRWLOCK m_lock = SRWLOCK_INIT;
|
||||
-
|
||||
- };
|
||||
-
|
||||
-
|
||||
- /**
|
||||
- * \brief Recursive mutex implementation
|
||||
- *
|
||||
- * Drop-in replacement for \c std::recursive_mutex that
|
||||
- * uses Win32 critical sections.
|
||||
- */
|
||||
- class recursive_mutex {
|
||||
-
|
||||
- public:
|
||||
-
|
||||
- using native_handle_type = PCRITICAL_SECTION;
|
||||
-
|
||||
- recursive_mutex() {
|
||||
- InitializeCriticalSection(&m_lock);
|
||||
- }
|
||||
-
|
||||
- ~recursive_mutex() {
|
||||
- DeleteCriticalSection(&m_lock);
|
||||
- }
|
||||
-
|
||||
- recursive_mutex(const recursive_mutex&) = delete;
|
||||
- recursive_mutex& operator = (const recursive_mutex&) = delete;
|
||||
-
|
||||
- void lock() {
|
||||
- EnterCriticalSection(&m_lock);
|
||||
- }
|
||||
-
|
||||
- void unlock() {
|
||||
- LeaveCriticalSection(&m_lock);
|
||||
- }
|
||||
-
|
||||
- bool try_lock() {
|
||||
- return TryEnterCriticalSection(&m_lock);
|
||||
- }
|
||||
-
|
||||
- native_handle_type native_handle() {
|
||||
- return &m_lock;
|
||||
- }
|
||||
-
|
||||
- private:
|
||||
-
|
||||
- CRITICAL_SECTION m_lock;
|
||||
-
|
||||
- };
|
||||
-
|
||||
-
|
||||
- /**
|
||||
- * \brief SRW-based condition variable implementation
|
||||
- *
|
||||
- * Drop-in replacement for \c std::condition_variable that
|
||||
- * uses Win32 condition variables on SRW locks.
|
||||
- */
|
||||
- class condition_variable {
|
||||
-
|
||||
- public:
|
||||
-
|
||||
- using native_handle_type = PCONDITION_VARIABLE;
|
||||
-
|
||||
- condition_variable() {
|
||||
- InitializeConditionVariable(&m_cond);
|
||||
- }
|
||||
-
|
||||
- condition_variable(condition_variable&) = delete;
|
||||
-
|
||||
- condition_variable& operator = (condition_variable&) = delete;
|
||||
-
|
||||
- void notify_one() {
|
||||
- WakeConditionVariable(&m_cond);
|
||||
- }
|
||||
-
|
||||
- void notify_all() {
|
||||
- WakeAllConditionVariable(&m_cond);
|
||||
- }
|
||||
-
|
||||
- void wait(std::unique_lock<dxvk::mutex>& lock) {
|
||||
- auto srw = lock.mutex()->native_handle();
|
||||
- SleepConditionVariableSRW(&m_cond, srw, INFINITE, 0);
|
||||
- }
|
||||
-
|
||||
- template<typename Predicate>
|
||||
- void wait(std::unique_lock<dxvk::mutex>& lock, Predicate pred) {
|
||||
- while (!pred())
|
||||
- wait(lock);
|
||||
- }
|
||||
-
|
||||
- template<typename Clock, typename Duration>
|
||||
- std::cv_status wait_until(std::unique_lock<dxvk::mutex>& lock, const std::chrono::time_point<Clock, Duration>& time) {
|
||||
- auto now = Clock::now();
|
||||
-
|
||||
- return (now < time)
|
||||
- ? wait_for(lock, now - time)
|
||||
- : std::cv_status::timeout;
|
||||
- }
|
||||
-
|
||||
- template<typename Clock, typename Duration, typename Predicate>
|
||||
- bool wait_until(std::unique_lock<dxvk::mutex>& lock, const std::chrono::time_point<Clock, Duration>& time, Predicate pred) {
|
||||
- if (pred())
|
||||
- return true;
|
||||
-
|
||||
- auto now = Clock::now();
|
||||
- return now < time && wait_for(lock, now - time, pred);
|
||||
- }
|
||||
-
|
||||
- template<typename Rep, typename Period>
|
||||
- std::cv_status wait_for(std::unique_lock<dxvk::mutex>& lock, const std::chrono::duration<Rep, Period>& timeout) {
|
||||
- auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(timeout);
|
||||
- auto srw = lock.mutex()->native_handle();
|
||||
-
|
||||
- return SleepConditionVariableSRW(&m_cond, srw, ms.count(), 0)
|
||||
- ? std::cv_status::no_timeout
|
||||
- : std::cv_status::timeout;
|
||||
- }
|
||||
-
|
||||
- template<typename Rep, typename Period, typename Predicate>
|
||||
- bool wait_for(std::unique_lock<dxvk::mutex>& lock, const std::chrono::duration<Rep, Period>& timeout, Predicate pred) {
|
||||
- bool result = pred();
|
||||
-
|
||||
- if (!result && wait_for(lock, timeout) == std::cv_status::no_timeout)
|
||||
- result = pred();
|
||||
-
|
||||
- return result;
|
||||
- }
|
||||
-
|
||||
- native_handle_type native_handle() {
|
||||
- return &m_cond;
|
||||
- }
|
||||
-
|
||||
- private:
|
||||
-
|
||||
- CONDITION_VARIABLE m_cond;
|
||||
-
|
||||
- };
|
||||
+ using mutex = std::mutex;
|
||||
+ using recursive_mutex = std::recursive_mutex;
|
||||
+ using condition_variable = std::condition_variable;
|
||||
|
||||
}
|
||||
|
|
@ -1,33 +1,52 @@
|
|||
{ lib
|
||||
, pkgs
|
||||
, stdenv
|
||||
, hostPlatform
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, pkgsCross
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (hostPlatform.uname) system;
|
||||
|
||||
# DXVK needs to be a separate derivation because it’s actually a set of DLLs for Windows that
|
||||
# needs to be built with a cross-compiler.
|
||||
dxvk32 = pkgsCross.mingw32.callPackage ./dxvk.nix { inherit (self) src version dxvkPatches; };
|
||||
dxvk64 = pkgsCross.mingwW64.callPackage ./dxvk.nix { inherit (self) src version dxvkPatches; };
|
||||
|
||||
# Split out by platform to make maintenance easy in case supported versions on Darwin and other
|
||||
# platforms diverge (due to the need for Darwin-specific patches that would fail to apply).
|
||||
# Should that happen, set `darwin` to the last working `rev` and `hash`.
|
||||
srcs = rec {
|
||||
darwin = { inherit (default) rev hash version; };
|
||||
default = {
|
||||
rev = "v${self.version}";
|
||||
hash = "sha256-+6PkrkamSvhCaGj2tq+RXri/yQ7vs0cAqgdRAFtU8UA=";
|
||||
version = "1.10.1";
|
||||
};
|
||||
};
|
||||
|
||||
# Use the self pattern to support overriding `src` and `version` via `overrideAttrs`. A recursive
|
||||
# attrset wouldn’t work.
|
||||
self = stdenv.mkDerivation {
|
||||
self = stdenvNoCC.mkDerivation {
|
||||
name = "dxvk";
|
||||
version = "1.10";
|
||||
inherit (srcs."${system}" or srcs.default) version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doitsujin";
|
||||
repo = "dxvk";
|
||||
rev = "v${self.version}";
|
||||
hash = "sha256-/zH6vER/6s/d+Tt181UJOa97sqdkJyKGw6E36+1owzQ=";
|
||||
inherit (srcs."${system}" or srcs.default) rev hash;
|
||||
};
|
||||
|
||||
# Patch DXVK to work with MoltenVK even though it doesn’t support some required features.
|
||||
# Some games will work poorly (particularly Unreal Engine 4 games), but others work pretty well.
|
||||
# Override this to patch DXVK itself (rather than the setup script).
|
||||
dxvkPatches = lib.optional stdenv.isDarwin ./darwin-dxvk-compat.patch;
|
||||
dxvkPatches = lib.optionals stdenvNoCC.isDarwin [
|
||||
# Patch DXVK to work with MoltenVK even though it doesn’t support some required features.
|
||||
# Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well.
|
||||
./darwin-dxvk-compat.patch
|
||||
# Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin.
|
||||
# See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/
|
||||
./darwin-thread-primitives.patch
|
||||
];
|
||||
|
||||
outputs = [ "out" "bin" "lib" ];
|
||||
|
||||
|
|
@ -53,6 +72,7 @@ let
|
|||
|
||||
# DXVK with MoltenVK requires a patched MoltenVK in addition to its own patches. Provide a
|
||||
# convenience function to handle the necessary patching.
|
||||
#
|
||||
# Usage:
|
||||
# let
|
||||
# patchedMoltenVK = dxvk.patchMoltenVK darwin.moltenvk;
|
||||
|
|
@ -61,9 +81,10 @@ let
|
|||
passthru.patchMoltenVK = moltenvk:
|
||||
moltenvk.overrideAttrs (old: {
|
||||
patches = old.patches or [ ] ++ [
|
||||
# Lie to DXVK about certain features that DXVK expects to be available and set defaults
|
||||
# for better performance/compatability on certain hardware.
|
||||
./darwin-moltenvk-compat.patch
|
||||
# Apply MoltenVK’s DXVK compatability patch. This is needed to fake support for certain
|
||||
# extensions. There is no package for a patched MoltenVK to avoid any confusion by users
|
||||
# whether they should use it. Except with DXVK, the answer is always no.
|
||||
old.passthru.dxvkPatch
|
||||
];
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -19,18 +19,6 @@ stdenv.mkDerivation {
|
|||
|
||||
patches = dxvkPatches;
|
||||
|
||||
# Replace use of DXVK’s threading classes with the ones from the C++ standard library, which uses
|
||||
# mcfgthreads in nixpkgs.
|
||||
postPatch = ''
|
||||
for class in mutex recursive_mutex condition_variable; do
|
||||
for file in $(grep -rl dxvk::$class *); do
|
||||
if [ "$(basename "$file")" != "thread.h" ]; then
|
||||
substituteInPlace "$file" --replace dxvk::$class std::$class
|
||||
fi
|
||||
done
|
||||
done
|
||||
'';
|
||||
|
||||
mesonFlags =
|
||||
let
|
||||
arch = if stdenv.is32bit then "32" else "64";
|
||||
|
|
|
|||
|
|
@ -43,6 +43,10 @@ stdenvNoCC.mkDerivation rec {
|
|||
# MoltenVK requires specific versions of its dependencies.
|
||||
# Pin them here except for cereal, which is four years old and has several CVEs.
|
||||
passthru = {
|
||||
# The patch required to support DXVK may different from version to version. This should never
|
||||
# be used except with DXVK, so there’s no package for it. To emphasize that this patch should
|
||||
# never be used except with DXVK, `dxvk` provides a function for applying this patch.
|
||||
dxvkPatch = ./dxvk-moltenvk-compat.patch;
|
||||
glslang = (glslang.overrideAttrs (old: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.272";
|
||||
version = "4.14.273";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0scx13pc5y5jmm5xa17my242gsgb1mf0cgqzjx656g7kkh4phqcv";
|
||||
sha256 = "0bdwmj6hpy5gb9y50hchgjcjp4z5y7vyk8d8y1ncyrvi18r1pz8v";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.235";
|
||||
version = "4.19.236";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1615y3ma9icmqqr7lisl8nd8zvvkh77a81yl39yvy6qi9345l32k";
|
||||
sha256 = "1h1ipqpcpi5ga1dg78y9gjmd2a7gkc52i0l83xbr13gyranzcbh0";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.307";
|
||||
version = "4.9.308";
|
||||
extraMeta.branch = "4.9";
|
||||
extraMeta.broken = stdenv.isAarch64;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1xyhz7hq8yyclxyavzk36sbl41vlb74pccd56240kq34ma1hyis7";
|
||||
sha256 = "11rf3zr31ap6rzy3s489c1dqzkfn5cfkm579y4dnssdyzmyams3v";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.107";
|
||||
version = "5.10.108";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1snzzhkzdjlj92gqig3sanxlhv0xc0xk2xwjdjr0yds6g43w6ry4";
|
||||
sha256 = "1n216rdlmb0x3az4hl224m8c8sddlqwzmqnds4s8z2wiw3bc4v5z";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.15.30";
|
||||
version = "5.15.31";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -15,6 +15,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0ckiz985x88x68psg6wazyk7zpv34k8rbzpzyzj0gaph13za4ki5";
|
||||
sha256 = "123b4i5li70spf1y8642y8jwkjjcgcg23x8bj4kxkgnm8x5kh8gn";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.16.16";
|
||||
version = "5.16.17";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "13qk6cjnjwgnxj25mphyv08pjf1sqz7bxxrr3fpl8gz3aghdd9yc";
|
||||
sha256 = "1z7i6z36rs777xiff5x3qjdc02x91n9ibf7rqr003ws7bf84vvnf";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.186";
|
||||
version = "5.4.187";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1f9rigm58miq5s98bx7pvylqi9hlzlfnq1nrj4cd8f4arcjcvxv1";
|
||||
sha256 = "1f57x6dqipj0kdcgii8qydbdsaq0w484g2wwgw1pi1dgyarkv7hq";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ stdenv, lib, fetchsvn, linux
|
||||
, scripts ? fetchsvn {
|
||||
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
|
||||
rev = "18635";
|
||||
sha256 = "0d74hji2cms9z3h3s1j4i7qnw1350a95vafrqargf9s2zz0bkgfc";
|
||||
rev = "18664";
|
||||
sha256 = "0yvgnqf355wr7wmfd0r8zydbr7icic06cp5hjp060vv0m9bf87xi";
|
||||
}
|
||||
, ...
|
||||
}:
|
||||
|
|
|
|||
22
pkgs/servers/irc/irccat/default.nix
Normal file
22
pkgs/servers/irc/irccat/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "irccat";
|
||||
version = "0.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "irccloud";
|
||||
repo = "irccat";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fr5x1usviJPbc4t5SpIVgV9Q6071XG8eYtyeyraddts=";
|
||||
};
|
||||
|
||||
vendorSha256 = "030hnkwh45yqppm96yy15j82skf7wmax5xkm7j5khr1l9lrz4591";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/irccloud/irccat";
|
||||
description = "Send events to IRC channels from scripts and other applications";
|
||||
maintainers = with maintainers; [ qyliss ];
|
||||
license = licenses.gpl3Only;
|
||||
};
|
||||
}
|
||||
|
|
@ -5,15 +5,15 @@
|
|||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2022-03-22";
|
||||
version = "2022-03-26";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "50113a53f379b7d98e6921ba58e8440324beb32c";
|
||||
rev = "dbadfa0810c0be346b98c02cc802c33fa43bee11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "RBaJ6/NmPS106xWEj47zBsTWSOp19aq3WTyXcdA5T3c=";
|
||||
sha256 = "GXg3GmJp0rSIaZKf3+YDbghpGEnvhf8TRiDQSLvO/ZM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.88.0";
|
||||
version = "0.89.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-HngpmCJ2oT+6LKtYGaDmQYjB6ibeIr8AaTZp8w8gftc=";
|
||||
sha256 = "sha256-8Cdvt+WB/Tl5jFNRlE2t62Y7O0QIxtZWF8F/dLDSqkw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-hF7G5Bh87gf2gpaorBh7aICfhq4jPXj6Zay/qMC+cmU=";
|
||||
vendorSha256 = "sha256-SJowSDvthxwfAyMSRtNkQbyOy8L5HjkVRkxG/L4/dLc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bacula";
|
||||
version = "11.0.5";
|
||||
version = "11.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-71s7Z4EEQiAbgNwdR8zvd7XtN4/hKFQG86c0AbboERo=";
|
||||
sha256 = "sha256-AZWgi81PV4rkqc4Nkff4ZzHGNNVrgQU0ci1yGyqe7Lc=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sic-image-cli";
|
||||
version = "0.19.0";
|
||||
version = "0.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foresterre";
|
||||
repo = "sic";
|
||||
rev = "v${version}";
|
||||
sha256 = "11km8ngndmzp6sxyfnbll80nigi790s353v7j31jvqcgyn9gjdq9";
|
||||
sha256 = "sha256-lFb1roQd6CK/9fKWO4SC0CbOLZglB+pS9ZqTdGRHk0Y=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-mHfQ36Xo37VRRq0y0xvUYy0MAlrfnOfMy1t3IZFdrE8=";
|
||||
cargoSha256 = "sha256-9m8gdbrVv+6tGMg1GTUPy4eRqRQa9zy9BZwfZqNqSS0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles nasm ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "esptool";
|
||||
version = "3.2";
|
||||
version = "3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "espressif";
|
||||
repo = "esptool";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jic5kynfan5zirv9pm3pfjps12zf68cpnhl7i1vls2m79zdkfa3";
|
||||
sha256 = "sha256-CmGie+M3AboOk8X+LkRhIxTRQZgDlklouzmz8kiIZuI=";
|
||||
};
|
||||
|
||||
checkInputs = with python3.pkgs;
|
||||
|
|
|
|||
30
pkgs/tools/misc/pandoc-include/default.nix
Normal file
30
pkgs/tools/misc/pandoc-include/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, natsort
|
||||
, panflute
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "pandoc-include";
|
||||
version = "1.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DCsunset";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kuxud7m+sWcNqE8A+Fwb8ATgiUwxQvHeYBTyw1UzX4U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ natsort panflute ];
|
||||
|
||||
pythonImportsCheck = [ "pandoc_include.main" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pandoc filter to allow file and header includes";
|
||||
homepage = "https://github.com/DCsunset/pandoc-include";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ppenguin ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,8 +2,6 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, openssl
|
||||
, installShellFiles
|
||||
, libiconv
|
||||
, nixosTests
|
||||
|
|
@ -22,10 +20,9 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "sha256-mqUE4JzNBhvtDpT2LM23eHX8q93wtPqA+/zr/PxEDiE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security Foundation ];
|
||||
|
||||
postInstall = ''
|
||||
for shell in bash fish zsh; do
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
{ stdenv, lib, fetchFromGitHub, python2, util-linux }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "bud";
|
||||
version = "0.34.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "indutny";
|
||||
repo = "bud";
|
||||
rev = "b112852c9667632f692d2ce3dcd9a8312b61155a";
|
||||
sha256 = "sha256-sHXwxWCCVL8Wyo6PAjbA2jj7FXOjCAOezaYKRgk12SM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python2 python2.pkgs.gyp
|
||||
] ++ lib.optional stdenv.isLinux util-linux;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildPhase = ''
|
||||
python ./gyp_bud -f make
|
||||
make -C out
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp out/Release/bud $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A TLS terminating proxy";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
# Does not build on aarch64-linux.
|
||||
badPlatforms = [ "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
};
|
||||
}
|
||||
|
|
@ -13,8 +13,8 @@
|
|||
let
|
||||
sha256 = "1f0nrdg8hf650qxz79i3a1d2zyf24niyrcnbnhc9i7hzbnqbp5qg";
|
||||
# specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`.
|
||||
specVersion = "4.118.3";
|
||||
specSha256 = "0jf4fnadcdfm4ja0d0m5rxcpg48cqsi9plaqz6kwyx3mp2snx9yc";
|
||||
specVersion = "4.119.0";
|
||||
specSha256 = "0q5cqx9w44a85r8h9an4iz4m3s7x3b0nyk188i3hsh3r1wf1nryv";
|
||||
spec = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml";
|
||||
sha256 = specSha256;
|
||||
|
|
|
|||
|
|
@ -118,6 +118,7 @@ mapAliases ({
|
|||
bird2 = bird; # Added 2022-02-21
|
||||
bird6 = throw "bird6 was dropped. Use bird instead, which has support for both ipv4/ipv6"; # Added 2022-02-21
|
||||
btrfsProgs = throw "'btrfsProgs' has been renamed to/replaced by 'btrfs-progs'"; # Converted to throw 2022-02-22
|
||||
bud = throw "bud has been removed: abandoned by upstream"; # Added 2022-03-14
|
||||
|
||||
# bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30)
|
||||
bitwarden_rs = vaultwarden;
|
||||
|
|
|
|||
|
|
@ -4100,8 +4100,6 @@ with pkgs;
|
|||
|
||||
btar = callPackage ../tools/backup/btar { };
|
||||
|
||||
bud = callPackage ../tools/networking/bud { };
|
||||
|
||||
bump2version = python3Packages.callPackage ../applications/version-management/git-and-tools/bump2version { };
|
||||
|
||||
bumpver = callPackage ../applications/version-management/bumpver { };
|
||||
|
|
@ -7531,6 +7529,8 @@ with pkgs;
|
|||
nodejs = nodejs-14_x;
|
||||
};
|
||||
|
||||
node2nix = nodePackages.node2nix;
|
||||
|
||||
np2kai = callPackage ../applications/emulators/np2kai { };
|
||||
|
||||
openipmi = callPackage ../tools/system/openipmi { };
|
||||
|
|
@ -8383,6 +8383,8 @@ with pkgs;
|
|||
|
||||
pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { };
|
||||
|
||||
pandoc-include = python3Packages.callPackage ../tools/misc/pandoc-include { };
|
||||
|
||||
pandoc-drawio-filter = python3Packages.callPackage ../tools/misc/pandoc-drawio-filter { };
|
||||
|
||||
pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { };
|
||||
|
|
@ -14138,9 +14140,10 @@ with pkgs;
|
|||
|
||||
pew = callPackage ../development/tools/pew {};
|
||||
|
||||
poetry = callPackage ../development/tools/poetry2nix/poetry2nix/pkgs/poetry {
|
||||
python = python3;
|
||||
};
|
||||
poetry = with python3Packages; toPythonApplication (callPackage ../development/tools/poetry2nix/poetry2nix/pkgs/poetry {
|
||||
inherit python;
|
||||
});
|
||||
|
||||
poetry2nix = callPackage ../development/tools/poetry2nix/poetry2nix {
|
||||
inherit pkgs lib;
|
||||
};
|
||||
|
|
@ -15081,6 +15084,8 @@ with pkgs;
|
|||
|
||||
funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };
|
||||
|
||||
license_finder = callPackage ../development/tools/license_finder { };
|
||||
|
||||
Literate = callPackage ../development/tools/literate-programming/Literate { };
|
||||
|
||||
md-tangle = callPackage ../development/tools/literate-programming/md-tangle { };
|
||||
|
|
@ -21470,6 +21475,8 @@ with pkgs;
|
|||
|
||||
imgproxy = callPackage ../servers/imgproxy { };
|
||||
|
||||
irccat = callPackage ../servers/irc/irccat { };
|
||||
|
||||
ircdog = callPackage ../applications/networking/irc/ircdog { };
|
||||
|
||||
ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
|
||||
|
|
|
|||
|
|
@ -198,6 +198,8 @@ in {
|
|||
inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
};
|
||||
|
||||
add-trailing-comma = callPackage ../development/python-modules/add-trailing-comma { };
|
||||
|
||||
addict = callPackage ../development/python-modules/addict { };
|
||||
|
||||
addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { };
|
||||
|
|
@ -522,6 +524,8 @@ in {
|
|||
|
||||
ansible-kernel = callPackage ../development/python-modules/ansible-kernel { };
|
||||
|
||||
ansible-later = callPackage ../development/python-modules/ansible-later { };
|
||||
|
||||
ansible-lint = callPackage ../development/python-modules/ansible-lint { };
|
||||
|
||||
ansible-runner = callPackage ../development/python-modules/ansible-runner { };
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ let
|
|||
manpage = "${getOutput "man" provider}/share/man/man1/${cmd}.1.gz";
|
||||
in runCommand "${cmd}-${provider.name}" {
|
||||
meta = {
|
||||
mainProgram = cmd;
|
||||
priority = 10;
|
||||
platforms = lib.platforms.${stdenv.hostPlatform.parsed.kernel.name} or lib.platforms.all;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue