Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-16 00:01:36 +00:00 committed by GitHub
commit fa7a791586
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
65 changed files with 2913 additions and 758 deletions

View file

@ -18,6 +18,8 @@
Additional commands to be executed for finalizing the derivation with runner script.
- `runScript`
A command that would be executed inside the sandbox and passed all the command line arguments. It defaults to `bash`.
- `profile`
Optional script for `/etc/profile` within the sandbox.
One can create a simple environment using a `shell.nix` like that:

View file

@ -0,0 +1,75 @@
{ stdenv, fetchurl, alsa-lib, cairo, dpkg, freetype
, gdk-pixbuf, glib, gtk3, lib, xorg
, libglvnd, libjack2, ffmpeg
, libxkbcommon, xdg-utils, zlib, pulseaudio
, wrapGAppsHook, makeWrapper }:
stdenv.mkDerivation rec {
pname = "bitwig-studio";
version = "4.0";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
sha256 = "38381c1a382abd9543931f34d5ae1789c31ec1217a1c852b5c5c442ccaf97063";
};
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
unpackCmd = ''
mkdir -p root
dpkg-deb -x $curSrc root
'';
dontBuild = true;
dontWrapGApps = true; # we only want $gappsWrapperArgs here
buildInputs = with xorg; [
alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp -r opt/bitwig-studio $out/libexec
ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio
cp -r usr/share $out/share
substitute usr/share/applications/com.bitwig.BitwigStudio.desktop \
$out/share/applications/com.bitwig.BitwigStudio.desktop \
--replace /usr/bin/bitwig-studio $out/bin/bitwig-studio
runHook postInstall
'';
postFixup = ''
# patchelf fails to set rpath on BitwigStudioEngine, so we use
# the LD_LIBRARY_PATH way
find $out -type f -executable \
-not -name '*.so.*' \
-not -name '*.so' \
-not -name '*.jar' \
-not -path '*/resources/*' | \
while IFS= read -r f ; do
patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f
wrapProgram $f \
"''${gappsWrapperArgs[@]}" \
--prefix PATH : "${lib.makeBinPath [ xdg-utils ffmpeg ]}" \
--suffix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath buildInputs}"
done
'';
meta = with lib; {
description = "A digital audio workstation";
longDescription = ''
Bitwig Studio is a multi-platform music-creation system for
production, performance and DJing, with a focus on flexible
editing tools and a super-fast workflow.
'';
homepage = "https://www.bitwig.com/";
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ bfortz michalrus mrVanDalo ];
};
}

View file

@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, openssl, freetype
{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, wrapGAppsHook, openssl, freetype
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome
, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
@ -82,7 +82,7 @@ stdenv.mkDerivation {
sha512 = "dabb55d2ba41f977b6d3f03bfcf147d11785136dd1277efc62011c8371ef25cc04531266bd16608639b9b6a500c1a18a45f44ba7a43e17ab5ac139e36eff7149";
};
nativeBuildInputs = [ makeWrapper squashfsTools ];
nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ];
dontStrip = true;
dontPatchELF = true;
@ -109,6 +109,9 @@ stdenv.mkDerivation {
runHook postUnpack
'';
# Prevent double wrapping
dontWrapGApps = true;
installPhase =
''
runHook preInstall
@ -138,6 +141,7 @@ stdenv.mkDerivation {
librarypath="${lib.makeLibraryPath deps}:$libdir"
wrapProgram $out/share/spotify/spotify \
''${gappsWrapperArgs[@]} \
--prefix LD_LIBRARY_PATH : "$librarypath" \
--prefix PATH : "${gnome.zenity}/bin"

View file

@ -9,14 +9,9 @@
, boost, libunwind, libsodium, pcsclite
, randomx, zeromq, libgcrypt, libgpgerror
, hidapi, rapidjson, quirc
, trezorSupport ? true
, libusb1
, protobuf
, python3
, trezorSupport ? true, libusb1, protobuf, python3
}:
with lib;
stdenv.mkDerivation rec {
pname = "monero-gui";
version = "0.17.2.2";
@ -30,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake pkg-config wrapQtAppsHook
(getDev qttools)
(lib.getDev qttools)
];
buildInputs = [
@ -41,8 +36,8 @@ stdenv.mkDerivation rec {
randomx libgcrypt libgpgerror
boost libunwind libsodium pcsclite
zeromq hidapi rapidjson quirc
] ++ optionals trezorSupport [ libusb1 protobuf python3 ]
++ optionals stdenv.isDarwin [ qtmacextras ];
] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]
++ lib.optionals stdenv.isDarwin [ qtmacextras ];
postUnpack = ''
# copy monero sources here
@ -98,7 +93,7 @@ stdenv.mkDerivation rec {
done;
'';
meta = {
meta = with lib; {
description = "Private, secure, untraceable currency";
homepage = "https://getmonero.org/";
license = licenses.bsd3;

View file

@ -4,17 +4,9 @@
, zeromq, pcsclite, readline, libsodium, hidapi
, randomx, rapidjson
, CoreData, IOKit, PCSC
, trezorSupport ? true
, libusb1 ? null
, protobuf ? null
, python3 ? null
, trezorSupport ? true, libusb1, protobuf, python3
}:
with lib;
assert stdenv.isDarwin -> IOKit != null;
assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];
stdenv.mkDerivation rec {
pname = "monero";
version = "0.17.2.0";
@ -45,8 +37,8 @@ stdenv.mkDerivation rec {
zeromq pcsclite readline
libsodium hidapi randomx rapidjson
protobuf
] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ]
++ optionals trezorSupport [ libusb1 protobuf python3 ];
] ++ lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ]
++ lib.optionals trezorSupport [ libusb1 protobuf python3 ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
@ -54,7 +46,7 @@ stdenv.mkDerivation rec {
"-DBUILD_GUI_DEPS=ON"
"-DReadline_ROOT_DIR=${readline.dev}"
"-DRandomX_ROOT_DIR=${randomx}"
] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
outputs = [ "out" "source" ];

View file

@ -0,0 +1,67 @@
{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch
, cmake, pkg-config
, boost, openssl, unbound
, pcsclite, readline, libsodium, hidapi
, rapidjson
, curl, sqlite
, trezorSupport ? true
, libusb1
, protobuf
, python3
}:
stdenv.mkDerivation rec {
pname = "oxen";
version = "9.1.3";
src = fetchFromGitHub {
owner = "oxen-io";
repo = "oxen-core";
rev = "v${version}";
sha256 = "11g3wqn0syk47yfcsdql5737kpad8skwdxhifn2yaz9zy8n3xqqb";
fetchSubmodules = true;
};
# Required for static linking, the only supported install path
lbzmqsrc = fetchurl {
url = "https://github.com/zeromq/libzmq/releases/download/v4.3.3/zeromq-4.3.3.tar.gz";
sha512 = "4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1";
};
postPatch = ''
# remove vendored libraries
rm -r external/rapidjson
sed -i s,/lib/,/lib64/, external/loki-mq/cmake/local-libzmq//LocalLibzmq.cmake
'';
postInstall = ''
rm -R $out/lib $out/include
'';
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
boost openssl unbound
pcsclite readline
libsodium hidapi rapidjson
protobuf curl sqlite
] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
# "-DUSE_DEVICE_TREZOR=ON"
# "-DBUILD_GUI_DEPS=ON"
"-DReadline_ROOT_DIR=${readline.dev}"
# It build with shared libs but doesn't install them. Fail.
# "-DBUILD_SHARED_LIBS=ON"
"-DLIBZMQ_TARBALL_URL=${lbzmqsrc}"
] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
meta = with lib; {
description = "Private cryptocurrency based on Monero";
homepage = "https://oxen.io/";
license = licenses.bsd3;
platforms = platforms.all;
maintainers = [ maintainers.viric ];
};
}

View file

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
sha256 = "06fj725xfhf3fwrf7dya7ijmxq3v76kfmd4lr2067a92zhlwr5pv";
};
phases = [ "installPhase" ];
dontConfigure = true;
installPhase = ''
tar xf ${src}

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ unzip ];
phases = [ "unpackPhase" "installPhase" ];
dontConfigure = true;
installPhase = let

View file

@ -1,24 +1,26 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
ki18n, xcb-util-cursor,
kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins,
knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
qtx11extras, knewstuff, kwayland, qttools
{ mkDerivation, lib
, extra-cmake-modules, kdoctools
, ki18n, xcb-util-cursor
, kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins
, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi
, qtbase, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
}:
mkDerivation {
pname = "spectacle";
meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
knewstuff kwayland
knewstuff kwayland kcolorpicker kimageannotator
];
postPatch = ''
substituteInPlace desktop/org.kde.spectacle.desktop.cmake \
--replace "Exec=@QtBinariesDir@/qdbus" "Exec=${lib.getBin qttools}/bin/qdbus"
'';
propagatedUserEnvPkgs = [ kipi-plugins libkipi ];
meta = with lib; {
maintainers = with maintainers; [ ttuegel ];
broken = versionOlder qtbase.version "5.15";
};
}

View file

@ -21,11 +21,11 @@
buildPythonApplication rec {
pname = "archivy";
version = "1.3.1";
version = "1.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-g7H22zJOQuxSmoJ3373eRcbderC67vkuiLN1CgaytFM=";
sha256 = "sha256-wQuR7cltDLr2u8BQ851MSjKmeLW8mQ/3bdEF5c9nxL0=";
};
# Relax some dependencies
@ -38,7 +38,10 @@ buildPythonApplication rec {
--replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \
--replace 'requests ==' 'requests >=' \
--replace 'validators ==' 'validators >=' \
--replace 'tinydb ==' 'tinydb >='
--replace 'tinydb ==' 'tinydb >=' \
--replace 'Flask_WTF == 0.14.3' 'Flask_WTF' \
--replace 'Werkzeug ==' 'Werkzeug >=' \
--replace 'Flask ==' 'Flask >='
'';
propagatedBuildInputs = [

View file

@ -0,0 +1,41 @@
{ lib, python3Packages, fetchFromGitHub, gtk-layer-shell, gtk3, gobject-introspection, wrapGAppsHook, wlr-randr }:
python3Packages.buildPythonPackage rec {
pname = "nwg-wrapper";
version = "0.0.1";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = pname;
rev = "v${version}";
sha256 = "1rpkcjr0chmgsfkan88lsi476bamg9a6y7h0x9zsh60a9rdf7dl8";
};
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
buildInputs = [ gtk3 gtk-layer-shell ];
propagatedBuildInputs = with python3Packages; [ i3ipc pygobject3 ];
# ValueError: Namespace GtkLayerShell not available
strictDeps = false;
# No tests
doCheck = false;
preFixup = ''
makeWrapperArgs+=(
"''${gappsWrapperArgs[@]}"
--prefix PATH : "${lib.makeBinPath [ wlr-randr ]}"
)
'';
pythonImportsCheck = [ "nwg_wrapper" ];
meta = with lib; {
description = "Wrapper to display a script output or a text file content on the desktop in sway or other wlroots-based compositors";
homepage = "https://github.com/nwg-piotr/nwg-wrapper/";
license = licenses.mit;
maintainers = with maintainers; [ artturin ];
};
}

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "octant";
version = "0.21.0";
version = "0.22.0";
src =
let
@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
};
in
fetchsrc version {
x86_64-linux = "sha256-Ben2wAquHADWBv1MEfPWxs96pLz1bK2F6bLoYVTSkng=";
aarch64-linux = "sha256-1kK0Gu4cQYk+QDJJJiiDan4SnP3Xjr8nLOBtv26UDV4=";
x86_64-darwin = "sha256-gOkHpUTWKrikKYZmkfgck3Lf3g5Pakcn0i2A9Hd07UE=";
aarch64-darwin = "sha256-Xpl8odVXw4WzF7CEZ+Bbxa6oQDBv9VMzHCNOjIcFGzE=";
x86_64-linux = "sha256-1/vyV6pUqovVpovTYFF4d75wJvtTNdrbLZyjw1lLacA=";
aarch64-linux = "sha256-1duNW0Edj0jrpv/RMrebtZF4ph6j3PXCJ2RFejOopGQ=";
x86_64-darwin = "sha256-Ur5jBPk5hA6cGg+pPf36Ijh94gWEdaWlJK3yCMBYyEU=";
aarch64-darwin = "sha256-RaiXW+MUihk291UWmrf6gLpyrd5stIkhyWNFEQ0daCk=";
};
dontConfigure = true;

View file

@ -2,7 +2,7 @@
let
pname = "octant-desktop";
version = "0.21.0";
version = "0.22.0";
name = "${pname}-${version}";
inherit (stdenv.hostPlatform) system;
@ -15,8 +15,8 @@ let
src = fetchurl {
url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}";
sha256 = {
x86_64-linux = "sha256-Woridi8uGsxvccdeaDzVLs+2YrRKUnm3WbX5LhorM1Y=";
x86_64-darwin = "sha256-NF3bm8WFEs4kgrUp+7qCbj6Z6pUMRUp7h4nhJQDJnoY=";
x86_64-linux = "sha256-xMdNoH0UE/KLIQ0DjJfb+ZB/q2F+kyFEncrQ9YYJgE0=";
x86_64-darwin = "sha256-y3fmxrsQ0hCa1wuMiRGHf79kpi25qXv/idKrVT87oc0=";
}.${system};
};

View file

@ -2,20 +2,18 @@
buildGoModule rec {
pname = "tektoncd-cli";
version = "0.19.1";
version = "0.20.0";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-duJSTk5LmJWbaVYybZZHWDe8E/ZqZLCCsdPIiH5d/G4=";
sha256 = "sha256-aVR1xNmL6M/m+1znt70vrCtuABCqDz0sDp8mDFI2uIg=";
};
vendorSha256 = null;
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}")
'';
ldflags = [ "-s" "-w" "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}" ];
nativeBuildInputs = [ installShellFiles ];
@ -27,7 +25,7 @@ buildGoModule rec {
# Some tests try to write to the home dir
export HOME="$TMPDIR"
# Change the golden files to match our desired version
sed -i "s/dev/${version}/" pkg/cmd/version/testdata/TestGetVersions-*.golden
sed -i "s/dev/${version}/" pkg/cmd/version/testdata/{TestGetVersions-,TestGetComponentVersions/}*.golden
'';
postInstall = ''
@ -43,8 +41,7 @@ buildGoModule rec {
installCheckPhase = ''
runHook preInstallCheck
$out/bin/tkn --help
# New tkn version functionality outputs empty https://github.com/tektoncd/cli/issues/1389
# $out/bin/tkn version | grep "Client version: ${version}"
$out/bin/tkn version | grep "Client version: ${version}"
runHook postInstallCheck
'';

View file

@ -5,6 +5,7 @@
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence
, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu
, writeScript, common-updater-scripts
}:
let
@ -71,7 +72,15 @@ in stdenv.mkDerivation rec {
mimeType = "x-scheme-handler/discord";
};
passthru.updateScript = ./update-discord.sh;
passthru.updateScript = writeScript "discord-update-script" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnugrep common-updater-scripts
set -eou pipefail;
url=$(curl -sI "https://discordapp.com/api/download/${builtins.replaceStrings ["discord-" "discord"] ["" "stable"] pname}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+')
version=''${url##https://dl*.discordapp.net/apps/linux/}
version=''${version%%/*.tar.gz}
update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix
'';
meta = with lib; {
description = "All-in-one cross-platform voice and text chat for gamers";

View file

@ -27,10 +27,10 @@ in {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
version = "0.0.125";
version = "0.0.126";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "0ly5a6l7rvl54mc39xma14jrcrf11q3ndnkkr16by5hy3palmz9g";
sha256 = "EraTDRKd6t0c9U68tSRdGkeB1hfqNS4KUewEXwkL8io=";
};
};
}.${branch}

View file

@ -1,36 +0,0 @@
#!/usr/bin/env bash
# script to generate ./default.nix
set -e
exec >"${BASH_SOURCE%/*}/default.nix"
cat <<EOF
{ branch ? "stable", pkgs }:
# Generated by ./update-discord.sh
let
inherit (pkgs) callPackage fetchurl;
in {
EOF
for branch in "" ptb canary; do
url=$(curl -sI "https://discordapp.com/api/download${branch:+/}${branch}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+')
version=${url##https://dl*.discordapp.net/apps/linux/}
version=${version%%/*.tar.gz}
echo " ${branch:-stable} = callPackage ./base.nix rec {"
echo " pname = \"discord${branch:+-}${branch}\";"
case $branch in
"") suffix="" ;;
ptb) suffix="PTB" ;;
canary) suffix="Canary" ;;
esac
echo " binaryName = \"Discord${suffix}\";"
echo " desktopName = \"Discord${suffix:+ }${suffix}\";"
echo " version = \"${version}\";"
echo " src = fetchurl {"
echo " url = \"${url//${version}/\$\{version\}}\";"
echo " sha256 = \"$(nix-prefetch-url "$url")\";"
echo " };"
echo " };"
done
echo "}.\${branch}"

View file

@ -3,56 +3,58 @@
, fetchFromGitLab
, pkg-config
, cmake
, qtquickcontrols2
, qtmultimedia
, qtgraphicaleffects
, qtkeychain
, libpulseaudio
, olm
, libsecret
, cmark
, extra-cmake-modules
, kconfig
, kdbusaddons
, ki18n
, kirigami2
, kitemmodels
, ki18n
, knotifications
, kdbusaddons
, kconfig
, libquotient
, kquickimageedit
, libpulseaudio
, libquotient
, libsecret
, olm
, qqc2-desktop-style
, qtgraphicaleffects
, qtkeychain
, qtmultimedia
, qtquickcontrols2
}:
mkDerivation rec {
pname = "neochat";
version = "1.1.1";
version = "1.2";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "network";
repo = pname;
rev = "v${version}";
sha256 = "sha256-HvLPsU+fxlyPDP7i9OSnZ/C1RjouOQCp+4WCl6FlFJo=";
sha256 = "sha256-Kpv7BY/qS0A3xFlYFhz1RRNwQVsyhOTHHGDbWRTTv1I=";
};
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
buildInputs = [
qtkeychain
qtquickcontrols2
qtmultimedia
qtgraphicaleffects
olm
libsecret
cmark
kconfig
kdbusaddons
ki18n
kirigami2
kitemmodels
ki18n
knotifications
kdbusaddons
kconfig
libquotient
kquickimageedit
libpulseaudio
libquotient
libsecret
olm
qtgraphicaleffects
qtkeychain
qtmultimedia
qtquickcontrols2
qqc2-desktop-style
];
meta = with lib; {

View file

@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
sha256 = "169kshjq4cf4i9v92azv0xaflrnik5686w7fwcgdhd6qkbzflzl6";
};
dontConfigure = true;
dontStrip = true;
phases = "unpackPhase installPhase";
installPhase = ''
mkdir -p $out/bin
cp -R bin $out/libexec

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
dontConfigure = true;
installPhase = ''
mkdir -p $out/share
@ -28,6 +28,5 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.linux;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ timor ];
inherit version;
};
}

View file

@ -1,6 +1,27 @@
{ lib, stdenv, fetchurl, fetchpatch, cmake, pcre, pkg-config, python2
, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, xz, gsl_1, xxHash
, Cocoa, OpenGL, noSplash ? false }:
{ lib
, stdenv
, fetchurl
, fetchpatch
, cmake
, pcre
, pkg-config
, python2
, libX11
, libXpm
, libXft
, libXext
, libGLU
, libGL
, zlib
, libxml2
, lz4
, xz
, gsl_1
, xxHash
, Cocoa
, OpenGL
, noSplash ? false
}:
stdenv.mkDerivation rec {
pname = "root";
@ -15,7 +36,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pcre python2 zlib libxml2 lz4 xz gsl_1 xxHash ]
++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
;
;
patches = [
./sw_vers_root5.patch

View file

@ -1,23 +1,73 @@
{ stdenv, lib, fetchurl, makeWrapper, cmake, git, ftgl, gl2ps, glew, gsl
, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, xz, pcre, nlohmann_json
, pkg-config, python, xxHash, zlib, zstd
, libAfterImage, giflib, libjpeg, libtiff, libpng
, Cocoa, CoreSymbolication, OpenGL, noSplash ? false }:
{ stdenv
, lib
, fetchurl
, makeWrapper
, cmake
, git
, ftgl
, gl2ps
, glew
, gsl
, libX11
, libXpm
, libXft
, libXext
, libGLU
, libGL
, libxml2
, lz4
, xz
, pcre
, nlohmann_json
, pkg-config
, python
, xxHash
, zlib
, zstd
, libAfterImage
, giflib
, libjpeg
, libtiff
, libpng
, Cocoa
, CoreSymbolication
, OpenGL
, noSplash ? false
}:
stdenv.mkDerivation rec {
pname = "root";
version = "6.24.00";
version = "6.24.02";
src = fetchurl {
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
sha256 = "12crjzd7pzx5qpk2pb3z0rhmxlw5gsqaqzfl48qiq8c9l940b8wx";
sha256 = "sha256-BQfhCV4nnMxyQPZR0llmAkMlF5+oWhJZtpS1ZyOtfBw=";
};
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
buildInputs = [ ftgl gl2ps glew pcre zlib zstd libxml2 lz4 xz gsl xxHash libAfterImage giflib libjpeg libtiff libpng nlohmann_json python.pkgs.numpy ]
++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ]
;
buildInputs = [
ftgl
gl2ps
glew
pcre
zlib
zstd
libxml2
lz4
xz
gsl
xxHash
libAfterImage
giflib
libjpeg
libtiff
libpng
nlohmann_json
python.pkgs.numpy
]
++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ]
;
patches = [
./sw_vers.patch

View file

@ -1,15 +1,14 @@
{ lib, stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git
}:
{ lib, stdenv, fetchFromGitHub, coreutils, git, gnugrep, gnused, makeWrapper, inotify-tools }:
stdenv.mkDerivation rec {
pname = "git-sync";
version = "20151024";
version = "unstable-2021-07-14";
src = fetchFromGitHub {
owner = "simonthum";
repo = "git-sync";
rev = "eb9adaf2b5fd65aac1e83d6544b9076aae6af5b7";
sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz";
rev = "7d3d34bf3ee2483fba00948f5b97f964b849a590";
sha256 = "sha256-PuYREW5NBkYF1tlcLTbOI8570nvHn5ifN8OIInfNNxI=";
};
nativeBuildInputs = [ makeWrapper ];
@ -18,10 +17,11 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
cp -a git-sync $out/bin/git-sync
cp -a git-* $out/bin/
'';
wrapperPath = with lib; makeBinPath [
inotify-tools
coreutils
git
gnugrep

View file

@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "gitkraken";
version = "7.6.1";
version = "7.7.0";
src = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
sha256 = "sha256-wpfTozXxanZkYtYQHY950PLsVO4lXLt5OOP/xDCrFEw=";
sha256 = "0zb94ipi777qkznxpgb7ah31mx9b63713k92vhxhz4glna59lvk3";
};
dontBuild = true;

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, pkg-config
, libjpeg, libtiff, libpng, freetype
, libtiff
, fltk, gtk
, libX11, libXext, libICE
, libICE, libSM
, dbus
, fetchpatch
}:
@ -24,8 +24,16 @@ stdenv.mkDerivation rec {
})
];
postPatch = ''
# Causes fatal ldconfig cache generation attempt on non-NixOS Linux
for mkfile in autoconf/Makefile.common.lib.in libAfter{Base,Image}/Makefile.in; do
substituteInPlace $mkfile \
--replace 'test -w /etc' 'false'
done
'';
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus ];
buildInputs = [ libtiff fltk gtk libICE libSM dbus ];
# A strange type of bug: dbus is not immediately found by pkg-config
preConfigure = ''

View file

@ -1,32 +1,39 @@
{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes }:
stdenv.mkDerivation rec {
pname = "qogir-icon-theme";
version = "2020-11-22";
version = "2021-07-14";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "04rkpsiz8jg9i55mslsh7a6wgyp30ja3xss7qacqimdab236300d";
sha256 = "0anma2ss3yqr9njx4ay2nyxjkgnj7ky17c93ipwgrvgsv8jk5nn2";
};
nativeBuildInputs = [ gtk3 ];
nativeBuildInputs = [ gtk3 jdupes ];
propagatedBuildInputs = [ hicolor-icon-theme ];
dontDropIconThemeCache = true;
# These fixup steps are slow and unnecessary.
dontPatchELF = true;
dontRewriteSymlinks = true;
installPhase = ''
runHook preInstall
patchShebangs install.sh
mkdir -p $out/share/icons
name= ./install.sh -d $out/share/icons
jdupes -l -r $out/share/icons
runHook postInstall
'';
meta = with lib; {
description = "Flat colorful design icon theme";
homepage = "https://github.com/vinceliuice/Qogir-icon-theme";
license = with licenses; [ gpl3 ];
license = with licenses; [ gpl3Only ];
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};

View file

@ -1,52 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi
, freeglut, libGLU, libGL, libjpeg, zlib, libXft, libpng
, libtiff, freetype, Cocoa, AGL, GLUT
}:
let
version = "1.4.x-r13121";
in
stdenv.mkDerivation {
pname = "fltk";
inherit version;
src = fetchurl {
url = "https://www.fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz";
sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63";
};
patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ]
++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
propagatedBuildInputs = [ xorgproto ]
++ (if stdenv.isDarwin
then [ freetype libtiff ]
else [ xlibsWrapper libXi freeglut ]);
configureFlags = [
"--enable-gl"
"--enable-largefile"
"--enable-shared"
"--enable-threads"
"--enable-xft"
];
preConfigure = ''
make clean
rm VERSION
'';
enableParallelBuilding = true;
meta = with lib; {
description = "A C++ cross-platform lightweight GUI library";
homepage = "https://www.fltk.org";
platforms = platforms.linux ++ platforms.darwin;
license = licenses.gpl2;
};
import ./common.nix rec {
version = "1.4.x-2021-07-04";
rev = "1008cdfab27609a6f6a0e82dadad9fd9cbd8a66d";
sha256 = "1h057dyhd04b9bjci952b2l7brxv183l9jw9i50mn9qjfljmvqim";
}

View file

@ -0,0 +1,205 @@
{ version, rev, sha256 }:
{ stdenv
, lib
, fetchFromGitHub
, cmake
, pkg-config
, zlib
, libjpeg
, libpng
, fontconfig
, freetype
, libX11
, libXext
, libXinerama
, libXfixes
, libXcursor
, libXft
, libXrender
, ApplicationServices
, Carbon
, Cocoa
, withGL ? true
, libGL
, libGLU
, glew
, OpenGL
, withCairo ? true
, cairo
, withPango ? (lib.strings.versionAtLeast version "1.4" && stdenv.hostPlatform.isLinux)
, pango
, withDocs ? true
, doxygen
, graphviz
, texlive
, withExamples ? true
, withShared ? true
}:
let
onOff = value: if value then "ON" else "OFF";
tex = texlive.combine {
inherit (texlive)
scheme-medium varwidth multirow hanging adjustbox collectbox stackengine
sectsty tocloft newunicodechar etoc;
};
in
stdenv.mkDerivation rec {
pname = "fltk";
inherit version;
src = fetchFromGitHub {
owner = "fltk";
repo = "fltk";
inherit rev sha256;
};
outputs = [ "out" ]
++ lib.optional withExamples "bin"
++ lib.optional withDocs "doc";
# Manually move example & test binaries to $bin to avoid cyclic dependencies on dev binaries
outputBin = lib.optionalString withExamples "out";
patches = lib.optionals stdenv.hostPlatform.isDarwin [
./nsosv.patch
];
postPatch = ''
patchShebangs documentation/make_*
'';
nativeBuildInputs = [
cmake
pkg-config
] ++ lib.optionals withDocs [
doxygen
graphviz
tex
];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
ApplicationServices
Carbon
] ++ lib.optionals (withGL && !stdenv.hostPlatform.isDarwin) [
libGL
libGLU
] ++ lib.optionals (withExamples && withGL) [
glew
];
propagatedBuildInputs = [
zlib
libjpeg
libpng
] ++ lib.optionals stdenv.hostPlatform.isLinux [
freetype
fontconfig
libX11
libXext
libXinerama
libXfixes
libXcursor
libXft
libXrender
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
Cocoa
] ++ lib.optionals (withGL && stdenv.hostPlatform.isDarwin) [
OpenGL
] ++ lib.optionals withCairo [
cairo
] ++ lib.optionals withPango [
pango
];
cmakeFlags = [
# Common
"-DOPTION_BUILD_SHARED_LIBS=${onOff withShared}"
"-DOPTION_USE_SYSTEM_ZLIB=ON"
"-DOPTION_USE_SYSTEM_LIBJPEG=ON"
"-DOPTION_USE_SYSTEM_LIBPNG=ON"
# X11
"-DOPTION_USE_XINERAMA=${onOff stdenv.hostPlatform.isLinux}"
"-DOPTION_USE_XFIXES=${onOff stdenv.hostPlatform.isLinux}"
"-DOPTION_USE_XCURSOR=${onOff stdenv.hostPlatform.isLinux}"
"-DOPTION_USE_XFT=${onOff stdenv.hostPlatform.isLinux}"
"-DOPTION_USE_XRENDER=${onOff stdenv.hostPlatform.isLinux}"
"-DOPTION_USE_XDBE=${onOff stdenv.hostPlatform.isLinux}"
# GL
"-DOPTION_USE_GL=${onOff withGL}"
"-DOpenGL_GL_PREFERENCE=GLVND"
# Cairo
"-DOPTION_CAIRO=${onOff withCairo}"
"-DOPTION_CAIROEXT=${onOff withCairo}"
# Pango
"-DOPTION_USE_PANGO=${onOff withPango}"
# Examples & Tests
"-DFLTK_BUILD_EXAMPLES=${onOff withExamples}"
# Docs
"-DOPTION_BUILD_HTML_DOCUMENTATION=${onOff withDocs}"
"-DOPTION_BUILD_PDF_DOCUMENTATION=${onOff withDocs}"
"-DOPTION_INSTALL_HTML_DOCUMENTATION=${onOff withDocs}"
"-DOPTION_INSTALL_PDF_DOCUMENTATION=${onOff withDocs}"
"-DOPTION_INCLUDE_DRIVER_DOCUMENTATION=${onOff withDocs}"
];
preBuild = lib.optionalString (withCairo && withShared && stdenv.hostPlatform.isDarwin) ''
# unresolved symbols in cairo dylib without this: https://github.com/fltk/fltk/issues/250
export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup"
'';
postBuild = lib.optionalString withDocs ''
make docs
'';
postInstall = lib.optionalString withExamples ''
mkdir -p $bin/bin
mv bin/{test,examples}/* $bin/bin/
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Library/Frameworks
mv $out{,/Library/Frameworks}/FLTK.framework
moveAppBundles() {
echo "Moving and symlinking $1"
appname="$(basename "$1")"
binname="$(basename "$(find "$1"/Contents/MacOS/ -type f -executable | head -n1)")"
curpath="$(dirname "$1")"
mkdir -p "$curpath"/../Applications/
mv "$1" "$curpath"/../Applications/
[ -f "$curpath"/"$binname" ] && rm "$curpath"/"$binname"
ln -s ../Applications/"$appname"/Contents/MacOS/"$binname" "$curpath"/"$binname"
}
rm $out/bin/fluid.icns
for app in $out/bin/*.app ${lib.optionalString withExamples "$bin/bin/*.app"}; do
moveAppBundles "$app"
done
'';
postFixup = ''
substituteInPlace $out/bin/fltk-config \
--replace "/$out/" "/"
'';
meta = with lib; {
description = "A C++ cross-platform lightweight GUI library";
homepage = "https://www.fltk.org";
platforms = platforms.unix;
# LGPL2 with static linking exception
# https://www.fltk.org/COPYING.php
license = licenses.lgpl2Only;
};
}

View file

@ -1,46 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi
, freeglut, libGL, libGLU, libjpeg, zlib, libXft, libpng
, libtiff, freetype, Cocoa, AGL, GLUT
}:
let
version = "1.3.5";
in
stdenv.mkDerivation {
pname = "fltk";
inherit version;
src = fetchurl {
url = "https://www.fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
sha256 = "00jp24z1818k9n6nn6lx7qflqf2k13g4kxr0p8v1d37kanhb4ac7";
};
patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ]
++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
propagatedBuildInputs = [ xorgproto ]
++ (if stdenv.isDarwin
then [ freetype libtiff ]
else [ xlibsWrapper libXi freeglut ]);
configureFlags = [
"--enable-gl"
"--enable-largefile"
"--enable-shared"
"--enable-threads"
"--enable-xft"
];
enableParallelBuilding = true;
meta = with lib; {
description = "A C++ cross-platform lightweight GUI library";
homepage = "https://www.fltk.org";
platforms = platforms.linux ++ platforms.darwin;
license = licenses.gpl2;
};
import ./common.nix rec {
version = "1.3.6";
rev = "release-${version}";
sha256 = "0vzk4d6j927v7dxywr5xlqlf70myal1xikkdfvd11p94rcdf9bsv";
}

View file

@ -0,0 +1,24 @@
{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase }:
mkDerivation rec {
pname = "kcolorpicker";
version = "0.1.6";
src = fetchFromGitHub {
owner = "ksnip";
repo = "kColorPicker";
rev = "v${version}";
sha256 = "1167xwk75yiz697vddbz3lq42l7ckhyl2cvigy4m05qgg9693ksd";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase ];
meta = with lib; {
description = "Qt based Color Picker with popup menu";
homepage = "https://github.com/ksnip/kColorPicker";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ fliegendewurst ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,24 @@
{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, kcolorpicker, qttools }:
mkDerivation rec {
pname = "kimageannotator";
version = "0.5.1";
src = fetchFromGitHub {
owner = "ksnip";
repo = "kImageAnnotator";
rev = "v${version}";
sha256 = "0hfvrd78lgwd7bccz0fx2pr7g0v3s401y5plra63rxwk55ffkxf8";
};
nativeBuildInputs = [ cmake qttools ];
buildInputs = [ qtbase kcolorpicker ];
meta = with lib; {
description = "Tool for annotating images";
homepage = "https://github.com/ksnip/kImageAnnotator";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ fliegendewurst ];
platforms = platforms.linux;
};
}

View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-mac-universal" "--enable-cxx" ];
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-const-int-float-conversion -Wno-error=nullability-completeness-on-arrays";
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=deprecated-declarations -Wno-error=implicit-const-int-float-conversion -Wno-error=nullability-completeness-on-arrays";
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];

View file

@ -35,6 +35,24 @@ let
'';
};
hyperspace-cli = super."@hyperspace/cli".override {
nativeBuildInputs = with pkgs; [
makeWrapper
libtool
autoconf
automake
];
buildInputs = with pkgs; [
nodePackages.node-gyp-build
nodejs
];
postInstall = ''
wrapProgram "$out/bin/hyp" --prefix PATH : ${
pkgs.lib.makeBinPath [ pkgs.nodejs ]
}
'';
};
coc-imselect = super.coc-imselect.override {
meta.broken = since "10";
};
@ -290,7 +308,7 @@ let
};
teck-programmer = super.teck-programmer.override {
buildInputs = [ pkgs.libusb ];
buildInputs = [ pkgs.libusb1 ];
};
vega-cli = super.vega-cli.override {

View file

@ -3,6 +3,7 @@
, "@antora/cli"
, "@antora/site-generator-default"
, "@bitwarden/cli"
, "@hyperspace/cli"
, "@nestjs/cli"
, "@vue/cli"
, "@webassemblyjs/cli"

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,30 @@
{ lib
, fetchFromGitLab
, buildDunePackage
, lwt
}:
buildDunePackage rec {
pname = "lwt-watcher";
version = "0.1";
src = fetchFromGitLab {
owner = "nomadic-labs";
repo = pname;
rev = "v${version}";
sha256 = "0kaf7py02i0dn9rvrbzxh4ljfg059wc8xvm093m9wy7lsa68rax9";
};
useDune2 = true;
propagatedBuildInputs = [
lwt
];
doCheck = true;
meta = {
description = "One-to-many broadcast in Lwt";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.ulrikstrid ];
};
}

View file

@ -2,19 +2,15 @@
buildPythonPackage rec {
pname = "crytic-compile";
version = "0.1.13";
version = "0.2.0";
disabled = pythonOlder "3.6";
patchPhase = ''
substituteInPlace setup.py --replace 'version="0.1.11",' 'version="${version}",'
'';
src = fetchFromGitHub {
owner = "crytic";
repo = "crytic-compile";
rev = version;
sha256 = "sha256-KJRfkUyUI0M7HevY4XKOtCvU+SFlsJIl3kTIccWfNmw=";
sha256 = "sha256-Kuc7g5+4TIcQTWYjG4uPN0Rxfom/A/xpek5K5ErlbdU=";
};
propagatedBuildInputs = [ pysha3 setuptools ];

View file

@ -1,37 +1,47 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, isPy27
, nose
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "dill";
version = "0.3.1.1";
version = "0.3.4";
doCheck = !isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "42d8ef819367516592a825746a18073ced42ca169ab1f5f4044134703e7a049c";
src = fetchFromGitHub {
owner = "uqfoundation";
repo = pname;
rev = "${pname}-${version}";
sha256 = "0x702gh50wb3n820p2p9w49cn4a354y207pllwc7snfxprv6hypm";
};
# python2 can't import a test fixture
doCheck = !isPy27;
checkInputs = [ nose ];
checkPhase = ''
PYTHONPATH=$PWD/tests:$PYTHONPATH
nosetests \
--ignore-files="test_classdef" \
--ignore-files="test_objects" \
--ignore-files="test_selected" \
--exclude="test_the_rest" \
--exclude="test_importable"
'';
checkInputs = [
pytestCheckHook
];
# Tests seem to fail because of import pathing and referencing items/classes in modules.
# Seems to be a Nix/pathing related issue, not the codebase, so disabling failing tests.
disabledTestPaths = [
"tests/test_diff.py"
"tests/test_module.py"
"tests/test_objects.py"
];
meta = {
disabledTests = [
"test_class_objects"
"test_method_decorator"
"test_importable"
"test_the_rest"
];
pythonImportsCheck = [ "dill" ];
meta = with lib; {
description = "Serialize all of python (almost)";
homepage = "https://github.com/uqfoundation/dill/";
license = lib.licenses.bsd3;
license = licenses.bsd3;
maintainers = with maintainers; [ ];
};
}

View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "gruut-ipa";
version = "0.9.2";
version = "0.9.3";
format = "setuptools";
src = fetchFromGitHub {
owner = "rhasspy";
repo = pname;
rev = "df74f7dff562d868ad8088b7251f9e7206271d37";
sha256 = "0b2znvjngffxc0mlmqmcai8l22ff09kc39bj6f0lkjw735vclnzh";
rev = "v${version}";
sha256 = "sha256-d/AbvgAD3GHXpwhqjT5Xt9q7Kix+eFMX4kW2BywZWX0=";
};
postPatch = ''

View file

@ -28,14 +28,14 @@ let
in
buildPythonPackage rec {
pname = "gruut";
version = "1.2.0";
version = "1.2.3";
format = "setuptools";
src = fetchFromGitHub {
owner = "rhasspy";
repo = pname;
rev = "v${version}";
sha256 = "1763qmcd1gxap27jppqaywx03k5cagcl62z2p2qdiqigdksplm2g";
sha256 = "sha256-qY4xsoVk1hyY9dYmVXaqDRjcShUQmp8VZOzAQNiC6EM=";
};
postPatch = ''

View file

@ -4,19 +4,21 @@
}:
buildPythonPackage rec {
pname = "pure-python-adb-homeassistant";
version = "0.1.6.dev0";
version = "0.1.7.dev0";
src = fetchPypi {
inherit pname version;
sha256 = "fe6d90220a6880649f6d6df4e707ce5034676710ee6146145ef995f7b769a482";
sha256 = "sha256-xXXEp8oYGcJLTfoBDUSZrIHSgDvB2EHbVMHoG4Hk+t8=";
};
# Disable tests as they require docker, docker-compose and a dedicated
# android emulator
doCheck = false;
pythonImportsCheck = [ "adb_messenger" ];
meta = with lib; {
description = "Pure python implementation of the adb client";
description = "Python implementation of the ADB client";
homepage = "https://github.com/JeffLIrion/pure-python-adb";
license = licenses.mit;
maintainers = [ maintainers.makefu ];

View file

@ -27,12 +27,12 @@ let
debuggerName = lib.strings.getName debugger;
in
buildPythonPackage rec {
version = "4.5.1";
version = "4.6.0";
pname = "pwntools";
src = fetchPypi {
inherit pname version;
sha256 = "97f945aed7ffa9d3e87f8759df83a5eac6dc2112907f35d0aee66a9bf62fd8eb";
sha256 = "sha256-FWnmE+XgbtRztgo/xxN2xK1bz1YhbqdywlrQIANHAww=";
};
postPatch = ''

View file

@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
, pytestCheckHook
, astropy
, astropy-helpers
, pillow
@ -9,29 +9,35 @@
buildPythonPackage rec {
pname = "pyavm";
version = "0.9.4";
version = "0.9.5";
src = fetchPypi {
pname = "PyAVM";
inherit version;
sha256 = "f298b864e5bc101ecbb0e46252e95e18a180ac28ba6ec362e63c12a7e914e386";
sha256 = "sha256-gV78ypvYwohHmdjP3lN5F97PfmxuV91tvw5gsYeZ7i8=";
};
propagatedBuildInputs = [ astropy-helpers ];
propagatedBuildInputs = [
astropy-helpers
];
checkInputs = [ pytest astropy pillow ];
checkPhase = "pytest";
checkInputs = [
astropy
pillow
pytestCheckHook
];
# Disable automatic update of the astropy-helper module
postPatch = ''
substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False"
'';
pythonImportsCheck = [ "pyavm" ];
meta = with lib; {
description = "Simple pure-python AVM meta-data handling";
homepage = "http://astrofrog.github.io/pyavm/";
homepage = "https://astrofrog.github.io/pyavm/";
license = licenses.mit;
maintainers = [ maintainers.smaret ];
maintainers = with maintainers; [ smaret ];
};
}

View file

@ -1,38 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
# Runtime inputs:
, pyparsing
# Check inputs:
, pytest
, mock
, pyparsing
, pytestCheckHook
, python-dateutil
}:
buildPythonPackage rec {
pname = "pyhocon";
version = "0.3.53";
version = "0.3.58";
src = fetchFromGitHub {
owner = "chimpler";
repo = "pyhocon";
rev = version;
sha256 = "1lr56piiasnq1aiwli8ldw2wc3xjfck8az991mr5rdbqqsrh9vkv";
sha256 = "sha256-ddspVDKy9++cISWH6R95r+gJrzNGqMTybI04OgVtIUU=";
};
propagatedBuildInputs = [ pyparsing ];
propagatedBuildInputs = [
pyparsing
python-dateutil
];
checkInputs = [ pytest mock ];
checkInputs = [
mock
pytestCheckHook
];
# Tests fail because necessary data files aren't packaged for PyPi yet.
# See https://github.com/chimpler/pyhocon/pull/203
doCheck = false;
pythonImportsCheck = [ "pyhocon" ];
meta = with lib; {
homepage = "https://github.com/chimpler/pyhocon/";
description = "HOCON parser for Python";
# Long description copied from
# https://github.com/chimpler/pyhocon/blob/55a9ea3ebeeac5764bdebebfbeacbf099f64db26/setup.py
# (the tip of master as of 2019-03-24).
# taken from https://pypi.org/project/pyhocon/
longDescription = ''
A HOCON parser for Python. It additionally provides a tool
(pyhocon) to convert any HOCON content into json, yaml and properties

View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pypck";
version = "0.7.9";
version = "0.7.10";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "alengwenus";
repo = pname;
rev = version;
sha256 = "0clpi6bplzw7qg2m0hgwqr71zwxrh901gwprhd1yjykn30njp5bw";
sha256 = "sha256-B2imewEONewj1Y+Q316reIBZB/b9WQAu67x9cLMkRTU=";
};
checkInputs = [

View file

@ -0,0 +1,74 @@
{ stdenv
, lib
, config
, fetchurl
, unzip
, makeWrapper
, icu
, libunwind
, curl
, zlib
, libuuid
, dotnetbuildhelpers
, dotnetCorePackages
, coreclr
, openssl
}:
stdenv.mkDerivation rec {
pname = "azure-functions-core-tools";
version = "3.0.3568";
src = fetchurl {
url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.linux-x64.${version}.zip";
sha256 = "0yxdqc5d1xsixjj2dlvs32d6fz4vh58ih2l00lc456fg15mfw3lg";
};
buildInputs = [
unzip
makeWrapper
dotnetbuildhelpers
];
nativeBuildInputs = [
icu
libunwind
curl
zlib
dotnetCorePackages.sdk_3_1
];
libPath = lib.makeLibraryPath [
libunwind
libuuid
stdenv.cc.cc
curl
zlib
icu
openssl
];
unpackPhase = ''
unzip $src
'';
installPhase = ''
mkdir -p $out/bin
cp -prd * $out/bin
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${libPath}" "$out/bin/func"
chmod +x $out/bin/func $out/bin/gozip
find $out/bin -type f -name "*.so" -exec patchelf --set-rpath "${libPath}" {} \;
wrapProgram "$out/bin/func" --prefix LD_LIBRARY_PATH : ${libPath}
'';
dontStrip = true; # Causes rpath patching to break if not set
meta = with lib; {
homepage = "https://github.com/Azure/azure-functions-core-tools";
description = "Command line tools for Azure Functions";
license = licenses.mit;
maintainers = with maintainers; [ jshcmpbll ];
platforms = platforms.linux;
};
}

View file

@ -66,13 +66,13 @@ let
in stdenv.mkDerivation rec {
pname = "omnisharp-roslyn";
version = "1.37.8";
version = "1.37.12";
src = fetchFromGitHub {
owner = "OmniSharp";
repo = pname;
rev = "v${version}";
sha256 = "1zi31m6ngk4rm7444n6q7mim096w5h4j2biwmvwmcf5yvig845za";
sha256 = "0gyy49v3pslr0l0q6h8hzah4s0iwkhkyckyrj3g2cg08w20b10gw";
};
nativeBuildInputs = [ makeWrapper msbuild ];

View file

@ -1,34 +1,34 @@
{ fetchurl }: [
{
name = "cake.scripting.abstractions";
version = "0.3.0";
version = "0.6.4";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.abstractions/0.3.0/cake.scripting.abstractions.0.3.0.nupkg";
sha256 = "009yca6zskcwx9hg3gpgapvzl5mvisl8ni737plbznx033bhw8s8";
url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.abstractions/0.6.4/cake.scripting.abstractions.0.6.4.nupkg";
sha256 = "14fcixlj2xazf6cb46gw8jgbsz89c6s8fnhvppxs8q12pygmkx0l";
};
}
{
name = "cake.scripting.transport";
version = "0.3.0";
version = "0.6.4";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.transport/0.3.0/cake.scripting.transport.0.3.0.nupkg";
sha256 = "0sc7rlnrqq30753h5cg3fndrlmix4vp2sxqb4sl044296mzcszl4";
url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.transport/0.6.4/cake.scripting.transport.0.6.4.nupkg";
sha256 = "08cwj572mvmlagj5jry11j2l2fqc6yl4sw0szvql4ard9cx7j51n";
};
}
{
name = "dotnet.script.dependencymodel";
version = "1.0.2";
version = "1.1.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel/1.0.2/dotnet.script.dependencymodel.1.0.2.nupkg";
sha256 = "0nqqplwykgbkpyidvkls9nrwxkpl1w1zrv8l7smjm62s18z5mqxb";
url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel/1.1.0/dotnet.script.dependencymodel.1.1.0.nupkg";
sha256 = "0ly1jwvzndrhgvrwy7kagabyca40j8w9p5jvvfj4wlpffvxq44xl";
};
}
{
name = "dotnet.script.dependencymodel.nuget";
version = "1.0.1";
version = "1.1.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel.nuget/1.0.1/dotnet.script.dependencymodel.nuget.1.0.1.nupkg";
sha256 = "1ja9wsc73l5bqx0nv8lzyj2l65h1i7sk77wc7biplb80wm1rvsj4";
url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel.nuget/1.1.0/dotnet.script.dependencymodel.nuget.1.1.0.nupkg";
sha256 = "1kvjrm28jlfmcsy5fna8hy814chbcsc39ka12h8mgpdvjkr93njr";
};
}
{
@ -41,10 +41,10 @@
}
{
name = "icsharpcode.decompiler";
version = "7.0.0.6372-preview3";
version = "7.1.0.6543";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/icsharpcode.decompiler/7.0.0.6372-preview3/icsharpcode.decompiler.7.0.0.6372-preview3.nupkg";
sha256 = "0g7ki0ia1qcp9z9hgs2f63yffx66y8zi43k7nrf2n122ll1f0hsg";
url = "https://api.nuget.org/v3-flatcontainer/icsharpcode.decompiler/7.1.0.6543/icsharpcode.decompiler.7.1.0.6543.nupkg";
sha256 = "1xrajs5dcd7aqsg9ibhdcy39yrd8737kknkmqf907n7fqs2jxr46";
};
}
{
@ -113,26 +113,34 @@
}
{
name = "microsoft.build";
version = "16.9.0";
version = "16.10.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.build/16.9.0/microsoft.build.16.9.0.nupkg";
sha256 = "0kgfx3iqmc58f3a59ggc1wi486fjrqnzgayxldhpr2w7q5600w5p";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.build/16.10.0/microsoft.build.16.10.0.nupkg";
sha256 = "1ran3fp016wvj8d2ahv0cmwhm6hjjh64w82s7cy52s7qffrgjk46";
};
}
{
name = "microsoft.build.framework";
version = "16.9.0";
version = "16.10.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/16.9.0/microsoft.build.framework.16.9.0.nupkg";
sha256 = "1yddq21q82p28k6cdq3hzic20l6dcma2fzfbm35zanfljxdsb4cf";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/16.10.0/microsoft.build.framework.16.10.0.nupkg";
sha256 = "17a8qxgq0jzxpjannhxkcg0941b64yb7z0yq75gz6hsq9ln3agja";
};
}
{
name = "microsoft.build.locator";
version = "1.4.1";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.locator/1.4.1/microsoft.build.locator.1.4.1.nupkg";
sha256 = "0j119rri7a401rca67cxdyrn3rprzdl1b2wrblqc23xsff1xvlrx";
};
}
{
name = "microsoft.build.tasks.core";
version = "16.9.0";
version = "16.10.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/16.9.0/microsoft.build.tasks.core.16.9.0.nupkg";
sha256 = "1gpra00srwvwzi0a3d5nkjik9y8glh6qn0qdba4f5wiza1l2bdzw";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/16.10.0/microsoft.build.tasks.core.16.10.0.nupkg";
sha256 = "0yc3p4bksxmbq1n8wfqgn6b6x9ccyzq229f0mn08z4jfima3cnxg";
};
}
{
@ -145,18 +153,18 @@
}
{
name = "microsoft.build.utilities.core";
version = "16.9.0";
version = "16.10.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/16.9.0/microsoft.build.utilities.core.16.9.0.nupkg";
sha256 = "0g05hmpzj33bknigdz5samw5pqss1q0sscv34sr53w2aiki5nx2c";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/16.10.0/microsoft.build.utilities.core.16.10.0.nupkg";
sha256 = "1rh3gzrz8mmzilvs33cxngv0a805nb47s615rvj4xk5igm384w14";
};
}
{
name = "microsoft.codeanalysis.analyzers";
version = "3.0.0";
version = "3.3.2";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.0.0/microsoft.codeanalysis.analyzers.3.0.0.nupkg";
sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.3.2/microsoft.codeanalysis.analyzers.3.3.2.nupkg";
sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4";
};
}
{
@ -169,66 +177,82 @@
}
{
name = "microsoft.codeanalysis.common";
version = "3.10.0-1.21125.6";
version = "4.0.0-2.21322.50";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/3.10.0-1.21125.6/microsoft.codeanalysis.common.3.10.0-1.21125.6.nupkg";
sha256 = "0rj7210v3i16pwjswa6fz3ksg19ncn8g7nm8qp8ly3xf9v5j25kn";
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.0.0-2.21322.50/microsoft.codeanalysis.common.4.0.0-2.21322.50.nupkg";
sha256 = "1j9yl7m0lr03fjklzjyiac1lrgs8541frqmi4xlldn8a2sx3h97x";
};
}
{
name = "microsoft.codeanalysis.csharp";
version = "3.10.0-1.21125.6";
version = "4.0.0-2.21322.50";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/3.10.0-1.21125.6/microsoft.codeanalysis.csharp.3.10.0-1.21125.6.nupkg";
sha256 = "194h2r33f2w2ssbnrp21ly3m7md9mizhhanmccqbkqg3pbjd2lik";
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.4.0.0-2.21322.50.nupkg";
sha256 = "1mmcl4rj3n1q7zh1n9b9ph3lvm8i51sdm87q3sgiczv2pxrihzs6";
};
}
{
name = "microsoft.codeanalysis.csharp.features";
version = "3.10.0-1.21125.6";
version = "4.0.0-2.21322.50";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/3.10.0-1.21125.6/microsoft.codeanalysis.csharp.features.3.10.0-1.21125.6.nupkg";
sha256 = "027njgyzc4w136sa9f68n8fx62qpzb4nigx50knljgk622k3acjl";
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.features.4.0.0-2.21322.50.nupkg";
sha256 = "11pzbswlznz71m248c1p4fi4i3zzvpc4a71px9j2lhnm57zy2lvy";
};
}
{
name = "microsoft.codeanalysis.csharp.scripting";
version = "3.10.0-1.21125.6";
version = "4.0.0-2.21322.50";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/3.10.0-1.21125.6/microsoft.codeanalysis.csharp.scripting.3.10.0-1.21125.6.nupkg";
sha256 = "1378ad9cfv5zlzix96q0viqylqzhgcb52zb8bc5y9k8rvnjqgppk";
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.scripting.4.0.0-2.21322.50.nupkg";
sha256 = "0piiyg1l27cy6s4ii80phrdsyhl8zvwbj9aljqkg53gki520x19p";
};
}
{
name = "microsoft.codeanalysis.csharp.workspaces";
version = "3.10.0-1.21125.6";
version = "4.0.0-2.21322.50";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/3.10.0-1.21125.6/microsoft.codeanalysis.csharp.workspaces.3.10.0-1.21125.6.nupkg";
sha256 = "1yhcm1qm7jjmp1fkpkkzq136frjqc558w49ygdiknyk253llqvm7";
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.workspaces.4.0.0-2.21322.50.nupkg";
sha256 = "0q6jkgjh1dylmjx8a79ighgbai1jr2fhls9m7khi87anzc3wdcl2";
};
}
{
name = "microsoft.codeanalysis.externalaccess.omnisharp";
version = "4.0.0-2.21322.50";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.0.0-2.21322.50/microsoft.codeanalysis.externalaccess.omnisharp.4.0.0-2.21322.50.nupkg";
sha256 = "1rv5qsj8lsfqxdzd6zazrzwzaxwmj6szd9hv2ckbb4lypkn8ifs8";
};
}
{
name = "microsoft.codeanalysis.externalaccess.omnisharp.csharp";
version = "4.0.0-2.21322.50";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.0.0-2.21322.50/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.0.0-2.21322.50.nupkg";
sha256 = "0ygp7hnm6mn9khh6z573avhvbcx5459fmyz4z657dx9p2v1f0fs0";
};
}
{
name = "microsoft.codeanalysis.features";
version = "3.10.0-1.21125.6";
version = "4.0.0-2.21322.50";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/3.10.0-1.21125.6/microsoft.codeanalysis.features.3.10.0-1.21125.6.nupkg";
sha256 = "1ydzx96a925a98zdxd6l9kgkl7b67sfbnkam61y0hkvgfdg1xg1a";
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.0.0-2.21322.50/microsoft.codeanalysis.features.4.0.0-2.21322.50.nupkg";
sha256 = "1grkql2wcqsqlmqnfchw6wxynwpz4x9wgqd00zpc1g04z9lqimq6";
};
}
{
name = "microsoft.codeanalysis.scripting.common";
version = "3.10.0-1.21125.6";
version = "4.0.0-2.21322.50";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/3.10.0-1.21125.6/microsoft.codeanalysis.scripting.common.3.10.0-1.21125.6.nupkg";
sha256 = "1blr101n2l7k0bmc248blh36a7nxbbjw3kirsn154zrbmc8s8m1m";
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.0.0-2.21322.50/microsoft.codeanalysis.scripting.common.4.0.0-2.21322.50.nupkg";
sha256 = "1c14bg99ywxdvlp5zc08ijc030rxmpb3171kz2z6f5kr02vf296x";
};
}
{
name = "microsoft.codeanalysis.workspaces.common";
version = "3.10.0-1.21125.6";
version = "4.0.0-2.21322.50";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/3.10.0-1.21125.6/microsoft.codeanalysis.workspaces.common.3.10.0-1.21125.6.nupkg";
sha256 = "029scic0mdbmw8gm6wmg5wsnjfx0s4wbfw5lbvyrpbfvdcagvyb2";
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.0.0-2.21322.50/microsoft.codeanalysis.workspaces.common.4.0.0-2.21322.50.nupkg";
sha256 = "1c0m5pg156x8zh50x7rp25p8cn09gbv50wpbz2p1nc5ff5dyavf5";
};
}
{
@ -257,18 +281,18 @@
}
{
name = "microsoft.extensions.caching.abstractions";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.abstractions/3.1.12/microsoft.extensions.caching.abstractions.3.1.12.nupkg";
sha256 = "1p65fs9rjrygviwbqdd214p9y7acpln6zhbd6b741slvp2jwjmyg";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.abstractions/5.0.0/microsoft.extensions.caching.abstractions.5.0.0.nupkg";
sha256 = "0j83zapqhgqb4v5f6kn891km095pfhvsqha357a86ccclmv2czvb";
};
}
{
name = "microsoft.extensions.caching.memory";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.memory/3.1.12/microsoft.extensions.caching.memory.3.1.12.nupkg";
sha256 = "0ydrnqwnph5npf3rwzw1kzq0g3c2kajicdk251fdnjkx6yiw1vsp";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.memory/5.0.0/microsoft.extensions.caching.memory.5.0.0.nupkg";
sha256 = "0l8spndl3kvccjlay202msm31iy5iig0i9ddbsdy92wbcjr97lca";
};
}
{
@ -281,10 +305,10 @@
}
{
name = "microsoft.extensions.configuration";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/3.1.12/microsoft.extensions.configuration.3.1.12.nupkg";
sha256 = "02bp53ahr98q3h8fzjl9rrxi48zja966dalrkbsqxqk1c5g1kl48";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/5.0.0/microsoft.extensions.configuration.5.0.0.nupkg";
sha256 = "01m9vzlq0vg0lhckj2dimwq42niwny8g3lm13c9a401hlyg90z1p";
};
}
{
@ -297,10 +321,10 @@
}
{
name = "microsoft.extensions.configuration.abstractions";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/3.1.12/microsoft.extensions.configuration.abstractions.3.1.12.nupkg";
sha256 = "0g35m4q03aag60pi3i5xi3p9q398w4jlq18n0n5qzq0xrlmny6k9";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/5.0.0/microsoft.extensions.configuration.abstractions.5.0.0.nupkg";
sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k";
};
}
{
@ -313,42 +337,42 @@
}
{
name = "microsoft.extensions.configuration.binder";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/3.1.12/microsoft.extensions.configuration.binder.3.1.12.nupkg";
sha256 = "18xizhcjwknwvj0fwdm91pssrpwndz7gzdlx48hph53z8cqqvkbv";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/5.0.0/microsoft.extensions.configuration.binder.5.0.0.nupkg";
sha256 = "0sld0bh2k5kss32i3nf8mwqkjagmw0d1cdfmxm87ckiicwm413a0";
};
}
{
name = "microsoft.extensions.configuration.commandline";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.commandline/3.1.12/microsoft.extensions.configuration.commandline.3.1.12.nupkg";
sha256 = "1c2qldblfp5m376a2nc82ljxjk0ljzrj48iwcvl6j48sjwcn3jl4";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.commandline/5.0.0/microsoft.extensions.configuration.commandline.5.0.0.nupkg";
sha256 = "084hnz5l0vr15ay23rksqipslqnz3pp30w9hsirpx1iqdm5688mc";
};
}
{
name = "microsoft.extensions.configuration.environmentvariables";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.environmentvariables/3.1.12/microsoft.extensions.configuration.environmentvariables.3.1.12.nupkg";
sha256 = "08wb14rp6pgsqwakvn0491mmarqhwbihq8gnri7bnf6chaaqbxml";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.environmentvariables/5.0.0/microsoft.extensions.configuration.environmentvariables.5.0.0.nupkg";
sha256 = "03gvckj10ljk1mir9g8cf3cajsnihhvmh8z8341gkr9h5653qkv0";
};
}
{
name = "microsoft.extensions.configuration.fileextensions";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.fileextensions/3.1.12/microsoft.extensions.configuration.fileextensions.3.1.12.nupkg";
sha256 = "03qg5mjs2f6ihs5dp6d7gbv5bxd98xdvmpwzxp8qyqifjgpkprkj";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.fileextensions/5.0.0/microsoft.extensions.configuration.fileextensions.5.0.0.nupkg";
sha256 = "1wq229r3xcmm9wh9sqdpvmfv4qpbp2zms9x6xk7g7sbb8h32hnz3";
};
}
{
name = "microsoft.extensions.configuration.json";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.json/3.1.12/microsoft.extensions.configuration.json.3.1.12.nupkg";
sha256 = "0mhq8d6iijhjyk9jv2k3fnqr6gpbxlzarb5m6y48dx5amnf89k42";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.json/5.0.0/microsoft.extensions.configuration.json.5.0.0.nupkg";
sha256 = "0hq5i483bjbvprp1la9l3si82x1ydxbvkpfc7r3s7zgxg957fyp9";
};
}
{
@ -361,10 +385,10 @@
}
{
name = "microsoft.extensions.dependencyinjection";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/3.1.12/microsoft.extensions.dependencyinjection.3.1.12.nupkg";
sha256 = "0fkcyxayj1mzdj124mabzvhl1p5irwab02rxnwf8bnvszkwgam8l";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/5.0.0/microsoft.extensions.dependencyinjection.5.0.0.nupkg";
sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4";
};
}
{
@ -377,42 +401,42 @@
}
{
name = "microsoft.extensions.dependencyinjection.abstractions";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/3.1.12/microsoft.extensions.dependencyinjection.abstractions.3.1.12.nupkg";
sha256 = "0flixm1physp9gxqzrrplzqkpfz4lljiak7fw87g65av0cksval2";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/5.0.0/microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg";
sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj";
};
}
{
name = "microsoft.extensions.dependencymodel";
version = "3.1.6";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/3.1.6/microsoft.extensions.dependencymodel.3.1.6.nupkg";
sha256 = "13m2na8a5mglbbjjp0dxb8ifkf23grkyk1g8585mr7v6cbj098ac";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/5.0.0/microsoft.extensions.dependencymodel.5.0.0.nupkg";
sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x";
};
}
{
name = "microsoft.extensions.fileproviders.abstractions";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.abstractions/3.1.12/microsoft.extensions.fileproviders.abstractions.3.1.12.nupkg";
sha256 = "11plp1izss3sz03a76gpicwfs0l3jqad0yhz0dam6iirdniharvx";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.abstractions/5.0.0/microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg";
sha256 = "01ahgd0b2z2zycrr2lcsq2cl59fn04bh51hdwdp9dcsdkpvnasj1";
};
}
{
name = "microsoft.extensions.fileproviders.physical";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.physical/3.1.12/microsoft.extensions.fileproviders.physical.3.1.12.nupkg";
sha256 = "1lgqvpbqhq2izgq2cka9ls5l99gymhx1ynh1887rjb890cb9hg42";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.physical/5.0.0/microsoft.extensions.fileproviders.physical.5.0.0.nupkg";
sha256 = "00vii8148a6pk12l9jl0rhjp7apil5q5qcy7v1smnv17lj4p8szd";
};
}
{
name = "microsoft.extensions.filesystemglobbing";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.filesystemglobbing/3.1.12/microsoft.extensions.filesystemglobbing.3.1.12.nupkg";
sha256 = "16binlxq56n6a3vkmxhlrhiyl01fb2zvyzfh00hwa4ixxfl1is8n";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.filesystemglobbing/5.0.0/microsoft.extensions.filesystemglobbing.5.0.0.nupkg";
sha256 = "0lm6n9vbyjh0l17qcc2y9qwn1cns3dyjmkvbxjp0g9sll32kjpmb";
};
}
{
@ -425,18 +449,10 @@
}
{
name = "microsoft.extensions.logging";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/3.1.12/microsoft.extensions.logging.3.1.12.nupkg";
sha256 = "12i0kvv4fl2y15dgzqzhqhj7fxy4qapqd78xwi1wsvrlbn9pp9h0";
};
}
{
name = "microsoft.extensions.logging.abstractions";
version = "1.1.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/1.1.0/microsoft.extensions.logging.abstractions.1.1.0.nupkg";
sha256 = "0vgp0jqi7rik4p5i86ib1lzhwldc3kyf4w38a1pd3086gfz021ab";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/5.0.0/microsoft.extensions.logging.5.0.0.nupkg";
sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3";
};
}
{
@ -449,26 +465,34 @@
}
{
name = "microsoft.extensions.logging.abstractions";
version = "3.1.12";
version = "2.1.1";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/3.1.12/microsoft.extensions.logging.abstractions.3.1.12.nupkg";
sha256 = "0yv681ddcrsn8cf0fnfi3jgcrmganf05r8lsw82d8rk0ljbjivz5";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/2.1.1/microsoft.extensions.logging.abstractions.2.1.1.nupkg";
sha256 = "1sgpwj0sa0ac7m5fnkb482mnch8fsv8hfbvk53c6lyh47s1xhdjg";
};
}
{
name = "microsoft.extensions.logging.abstractions";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/5.0.0/microsoft.extensions.logging.abstractions.5.0.0.nupkg";
sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc";
};
}
{
name = "microsoft.extensions.logging.configuration";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/3.1.12/microsoft.extensions.logging.configuration.3.1.12.nupkg";
sha256 = "0nrijpk4azaw5xk4473yb9sc1aal7phjrbswdg7dr6yrfibpb3fn";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/5.0.0/microsoft.extensions.logging.configuration.5.0.0.nupkg";
sha256 = "1kmjax24w0ph362jr64rr6f8pyn6ayq39k502q9yrgr7zgrv65pa";
};
}
{
name = "microsoft.extensions.logging.console";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/3.1.12/microsoft.extensions.logging.console.3.1.12.nupkg";
sha256 = "0vr65vcw15kycbpxk5z04nwcxlkcq0ljsnb4njcbzdcj4p87bcmr";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/5.0.0/microsoft.extensions.logging.console.5.0.0.nupkg";
sha256 = "162akclrhk5r62fza8yr30p5824inwmrpq2s510c3a64v76v9cqz";
};
}
{
@ -481,10 +505,10 @@
}
{
name = "microsoft.extensions.options";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/3.1.12/microsoft.extensions.options.3.1.12.nupkg";
sha256 = "0phxp1m5p2sfn7mgdb4dzb2rscda8wwzgr0hqqyh19faf0kg2msm";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/5.0.0/microsoft.extensions.options.5.0.0.nupkg";
sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay";
};
}
{
@ -497,10 +521,10 @@
}
{
name = "microsoft.extensions.options.configurationextensions";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/3.1.12/microsoft.extensions.options.configurationextensions.3.1.12.nupkg";
sha256 = "1vvxhy31mf3z7al8gh9pvzn4z67ma6zc7wwc6f7bvbg6k235wz2v";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/5.0.0/microsoft.extensions.options.configurationextensions.5.0.0.nupkg";
sha256 = "1085yrfgc70am43v8i5rxh14kal3bhdd5q85vgny5qp7y1rw0xyw";
};
}
{
@ -513,10 +537,10 @@
}
{
name = "microsoft.extensions.primitives";
version = "3.1.12";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/3.1.12/microsoft.extensions.primitives.3.1.12.nupkg";
sha256 = "0ns4dsrfglas2qdn6qdyg004yjsk578fgfq76rs16hjr3iw9dkks";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/5.0.0/microsoft.extensions.primitives.5.0.0.nupkg";
sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6";
};
}
{
@ -639,6 +663,14 @@
sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc";
};
}
{
name = "microsoft.net.stringtools";
version = "1.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.net.stringtools/1.0.0/microsoft.net.stringtools.1.0.0.nupkg";
sha256 = "06yakiyzgss399giivfx6xdrnfxqfsvy5fzm90scjanvandv0sdj";
};
}
{
name = "microsoft.sourcelink.common";
version = "1.0.0";
@ -657,26 +689,26 @@
}
{
name = "microsoft.testplatform.objectmodel";
version = "16.6.1";
version = "16.9.4";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/16.6.1/microsoft.testplatform.objectmodel.16.6.1.nupkg";
sha256 = "0q98q1nw6jl4bajm66z4a9vvh928w8ffsd3k6fpsps23ykpsky7h";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/16.9.4/microsoft.testplatform.objectmodel.16.9.4.nupkg";
sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6";
};
}
{
name = "microsoft.testplatform.translationlayer";
version = "16.6.1";
version = "16.9.4";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.translationlayer/16.6.1/microsoft.testplatform.translationlayer.16.6.1.nupkg";
sha256 = "1j5pg3qdgqxila90x5h1hvq8wk53s4zf225x5zddmx6q26r9zq83";
url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.translationlayer/16.9.4/microsoft.testplatform.translationlayer.16.9.4.nupkg";
sha256 = "0y5w2zflvq06jim2i6d49qi45ix0b8vlyf024w29n5g1lb570qf0";
};
}
{
name = "microsoft.visualstudio.debugger.contracts";
version = "16.9.0-beta.20604.1";
version = "17.2.0-beta.21262.1";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.debugger.contracts/16.9.0-beta.20604.1/microsoft.visualstudio.debugger.contracts.16.9.0-beta.20604.1.nupkg";
sha256 = "0sy1ahy1xv39mkk5inhb63lmfnmkcc6vjljhljx0l2lkrrc33k0h";
url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/78665e4c-b767-412b-9804-2b1ef7a48b8a/nuget/v3/flat2/microsoft.visualstudio.debugger.contracts/17.2.0-beta.21262.1/microsoft.visualstudio.debugger.contracts.17.2.0-beta.21262.1.nupkg";
sha256 = "10fi1jdxnxvww1qzfhqi53fn0a411gvpvcsb0pvwvj7qk0lzs7c9";
};
}
{
@ -1191,22 +1223,6 @@
sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r";
};
}
{
name = "system.componentmodel.annotations";
version = "4.4.1";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.componentmodel.annotations/4.4.1/system.componentmodel.annotations.4.4.1.nupkg";
sha256 = "1d46yx6h36bssqyshq44qxx0fsx43bjf09zrlbvqfigacfsp9mph";
};
}
{
name = "system.componentmodel.annotations";
version = "4.7.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.componentmodel.annotations/4.7.0/system.componentmodel.annotations.4.7.0.nupkg";
sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z";
};
}
{
name = "system.componentmodel.composition";
version = "4.5.0";
@ -1263,6 +1279,14 @@
sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63";
};
}
{
name = "system.configuration.configurationmanager";
version = "4.7.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.configuration.configurationmanager/4.7.0/system.configuration.configurationmanager.4.7.0.nupkg";
sha256 = "0pav0n21ghf2ax6fiwjbng29f27wkb4a2ddma0cqx04s97yyk25d";
};
}
{
name = "system.console";
version = "4.3.0";
@ -1287,6 +1311,14 @@
sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq";
};
}
{
name = "system.diagnostics.diagnosticsource";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/5.0.0/system.diagnostics.diagnosticsource.5.0.0.nupkg";
sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga";
};
}
{
name = "system.diagnostics.process";
version = "4.3.0";
@ -1409,10 +1441,10 @@
}
{
name = "system.io.pipelines";
version = "5.0.0";
version = "5.0.1";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/5.0.0/system.io.pipelines.5.0.0.nupkg";
sha256 = "1kdvbzr98sdddm18r3gbsbcxpv58gm1yy3iig8zg9dvp7mli7453";
url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/5.0.1/system.io.pipelines.5.0.1.nupkg";
sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v";
};
}
{
@ -1431,14 +1463,6 @@
sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv";
};
}
{
name = "system.memory";
version = "4.5.2";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.2/system.memory.4.5.2.nupkg";
sha256 = "1g24dwqfcmf4gpbgbhaw1j49xmpsz389l6bw2xxbsmnzvsf860ld";
};
}
{
name = "system.memory";
version = "4.5.3";
@ -1631,14 +1655,6 @@
sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276";
};
}
{
name = "system.reflection.typeextensions";
version = "4.1.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg";
sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7";
};
}
{
name = "system.reflection.typeextensions";
version = "4.3.0";
@ -1847,6 +1863,14 @@
sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml";
};
}
{
name = "system.security.cryptography.algorithms";
version = "4.3.1";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.3.1/system.security.cryptography.algorithms.4.3.1.nupkg";
sha256 = "1m2wnzg3m3c0s11jg4lshcl2a47d78zri8khc21yrz34jjkbyls2";
};
}
{
name = "system.security.cryptography.cng";
version = "4.3.0";
@ -1911,6 +1935,14 @@
sha256 = "1kg264xmqabyz8gfg8ymp6qp6aw43vawfp0znf0909d7b5jd3dq9";
};
}
{
name = "system.security.cryptography.protecteddata";
version = "4.7.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.7.0/system.security.cryptography.protecteddata.4.7.0.nupkg";
sha256 = "1s1sh8k10s0apa09c5m2lkavi3ys90y657whg2smb3y8mpkfr5vm";
};
}
{
name = "system.security.cryptography.x509certificates";
version = "4.3.0";
@ -2017,10 +2049,10 @@
}
{
name = "system.text.encodings.web";
version = "4.7.1";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/4.7.1/system.text.encodings.web.4.7.1.nupkg";
sha256 = "1wj7r07mjwbf9a79kapy2l9m8mcq8b3nbhg0zaprlsav09k85fmb";
url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/5.0.0/system.text.encodings.web.5.0.0.nupkg";
sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1";
};
}
{
@ -2033,10 +2065,10 @@
}
{
name = "system.text.json";
version = "4.7.2";
version = "5.0.0";
src = fetchurl {
url = "https://api.nuget.org/v3-flatcontainer/system.text.json/4.7.2/system.text.json.4.7.2.nupkg";
sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4";
url = "https://api.nuget.org/v3-flatcontainer/system.text.json/5.0.0/system.text.json.5.0.0.nupkg";
sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks";
};
}
{

View file

@ -1,7 +1,7 @@
{ lib, buildEnv, callPackage, makeWrapper, Cocoa }:
buildEnv {
name = "flare-1.12rc1";
name = "flare-1.12rc2";
paths = [
(callPackage ./engine.nix { inherit Cocoa; })

View file

@ -0,0 +1,15 @@
diff --git a/distribution/flare.desktop.in b/distribution/flare.desktop.in
index c740e2a6..eef91a89 100644
--- a/distribution/flare.desktop.in
+++ b/distribution/flare.desktop.in
@@ -14,8 +14,8 @@ Comment[fr]=Un jeu de rôle d'action monojoueur en 2D isométrique
Comment[gl]=Xogo individual de acción e rol cunha vista isométrica en dúas dimensións.
Comment[ru]=Изометрический ролевой боевик для одного игрока
Comment[uk]=Ізометричний рольовий екшн (Action/RPG) для одного гравця
-TryExec=@FLARE_EXECUTABLE_PATH@
-Exec=@FLARE_EXECUTABLE_PATH@
+TryExec=flare
+Exec=flare
Categories=Game;RolePlaying;
Icon=flare
Terminal=false

View file

@ -2,15 +2,17 @@
stdenv.mkDerivation rec {
pname = "flare-engine";
version = "1.12rc1";
version = "1.12rc2";
src = fetchFromGitHub {
owner = "flareteam";
repo = pname;
rev = "v${version}";
sha256 = "0bl5vayf87y2jd6b1w4nn7pbrhix6dj86xv5kzqxz6b2y65lq73p";
sha256 = "10il9dpbcka1w5glmhv48bqwww44csmhq426lvsc7z84444gvvgq";
};
patches = [ ./desktop.patch ];
nativeBuildInputs = [ cmake ];
buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ]
++ lib.optional stdenv.isDarwin Cocoa;

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flare-game";
version = "1.12rc1";
version = "1.12rc2";
src = fetchFromGitHub {
owner = "flareteam";
repo = pname;
rev = "v${version}";
sha256 = "1i2fa2hds5ph8gf5b9647vrn7ycz2fl9xaaaybz8yrjmnpx27bzc";
sha256 = "0k9fnbaqfgmih8bd0sh3kbk6f6v74i95wrbkij48gp48pq8yqbf9";
};
nativeBuildInputs = [ cmake ];

View file

@ -16,13 +16,13 @@ let
in stdenv.mkDerivation rec {
pname = "osu-lazer";
version = "2021.703.0";
version = "2021.707.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
sha256 = "52wGjNVCh1dyPgDfKnsfPcCI1Jh1R70zRUs/jNyaBI8=";
sha256 = "UdsN/kvpqZrOiigxGttwrExlOkEFa2xWqDQS/d7y/0k=";
};
patches = [ ./bypass-tamper-detection.patch ];

View file

@ -781,13 +781,13 @@
})
(fetchNuGet {
name = "ppy.LocalisationAnalyser";
version = "2021.614.0";
sha256 = "0b3b72lvjz8lfh0n5rilmf91j0phgmy1jjnw0v6l7qral72lhd4y";
version = "2021.706.0";
sha256 = "087x61vi1rv1slzr8hhcslngdd41p2d5r8yhpqm1kmls24csv556";
})
(fetchNuGet {
name = "ppy.osu.Framework";
version = "2021.702.0";
sha256 = "16lx73gikjl2bmndqh3vizfn1whjvvq2iwy8sll3yqwb20bg7kaa";
version = "2021.707.0";
sha256 = "1ai8yam6v67y9z8yipqjn578bk2qzqm05ncyqfgig3in6baxwpna";
})
(fetchNuGet {
name = "ppy.osu.Framework.NativeLibs";
@ -796,8 +796,8 @@
})
(fetchNuGet {
name = "ppy.osu.Game.Resources";
version = "2021.701.0";
sha256 = "0ii5ki983vxjq0iq28nzb9xqkmg8iscwj77hcnpf14cj7xiyg454";
version = "2021.706.0";
sha256 = "1yacqy8h93vph3faf4y0iwhlnlmbny3zj57cm2bh04z2gk0l17am";
})
(fetchNuGet {
name = "ppy.osuTK.NS20";

View file

@ -65,12 +65,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2021-07-12";
version = "2021-07-14";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "d098124e59ba38b0fcd97b41eec4a6de81bc09ab";
sha256 = "1q524z5xaxshgwwfwbzgad7d6ni9f1ldk2f67chnywd0v8c6qr7f";
rev = "d8f4e8b7081724c0b9ff2491dd68409b3da69b0f";
sha256 = "0rwj9rhkzg004jv9q8wr86l9xak4wqf7l5skq1nf8k0xis9aw6d3";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@ -221,12 +221,12 @@ final: prev:
auto-session = buildVimPluginFrom2Nix {
pname = "auto-session";
version = "2021-07-08";
version = "2021-07-15";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "auto-session";
rev = "e40bd7e5d08818380b244916c9dbd6bc9c5657a2";
sha256 = "03qb5ziwpd1x1jwvwsdipindlc0izwlmgnhinxyabhb17shsay7r";
rev = "f5e5dda7587db72b074edbc3b573d52df639f9a5";
sha256 = "1ddr28v44llmfsdf2l3ybgwijhv49dddghdk396nk0sw883a3hs8";
};
meta.homepage = "https://github.com/rmagatti/auto-session/";
};
@ -413,12 +413,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-07-13";
version = "2021-07-15";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "fca28c101eba19beffb9ce3018f1523f192adbfc";
sha256 = "1fzlhjnr8yvzcy8r1sj54app0gfvjcawsg10kj213z4k69z9v7ri";
rev = "8ed122e474a0316f8b967bb6c35a47e8dd383453";
sha256 = "0zk12wd1xs668j3wfdd5vyj685irnjsksrmn2dln6vsyb7xpq3r5";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -557,12 +557,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
version = "2021-07-09";
version = "2021-07-15";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
rev = "acc2b95be6652d79f86d586e52c7566557608476";
sha256 = "1cp6sqvy3xwssr6dn7nzbxb4a2jpskqdbivpaf7984zd2sx8sqrq";
rev = "3c3f118f8d48707f1890c2c212c083228aeac596";
sha256 = "0nim2hd0pn910ymm87zwfcw5b7x64h3dsnqhc20yj0r3s5xjg6qi";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@ -966,12 +966,12 @@ final: prev:
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
version = "2021-07-13";
version = "2021-07-15";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
rev = "0cd4c51246206c9c1e893dd4418e35d17ed67d52";
sha256 = "1wqmm96waqm11vkin5xzklvmr9z9j3iajvk1bmk9zxdffng6b2hv";
rev = "6ccd2d35581f5c497b2fe3e6a9ecbbb494210d6e";
sha256 = "0fg8gv38xvsv7y739m1wix5a384zjn0hqnmkqiz244jxii1l0p8y";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@ -1256,12 +1256,12 @@ final: prev:
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
version = "2021-07-13";
version = "2021-07-14";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
rev = "1b39ec8dde1e263570418cb65e0b6f63dce20ba0";
sha256 = "0mybjvr4kmkcf0sqr7hwlwfg9s9bzvqqw3sn46aqclqqhliimj2v";
rev = "49151bc9f7a52b02e5aac5eb76bbb80ba81e3726";
sha256 = "02csaq7x99l5h175kyy0bwdb8kdq3caldj6gkpc7lx7zdc987pwn";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@ -1474,12 +1474,12 @@ final: prev:
falcon = buildVimPluginFrom2Nix {
pname = "falcon";
version = "2021-06-11";
version = "2021-07-14";
src = fetchFromGitHub {
owner = "fenetikm";
repo = "falcon";
rev = "0893abf44cd6dda4d50e98c4ab1f9aea8e61d617";
sha256 = "12fa2kwg2495qhs845g31a9iszlrry4jc19famgpjg1glgm9lkrm";
rev = "0a67fda0cb7908a43ea4d3c7b8d3d413e305c2be";
sha256 = "1yjdj6n74z34lq7aayxnngkvyrcpgii9mh92l50jyq22mbqng4hj";
};
meta.homepage = "https://github.com/fenetikm/falcon/";
};
@ -1631,12 +1631,12 @@ final: prev:
formatter-nvim = buildVimPluginFrom2Nix {
pname = "formatter-nvim";
version = "2021-07-05";
version = "2021-07-15";
src = fetchFromGitHub {
owner = "mhartington";
repo = "formatter.nvim";
rev = "9866548f1c543ba90d7bb8a62c4fa939a5dcba46";
sha256 = "04289wv1zw7r30x7whzf2s9gis7g3a7l8wswsxiwf55zvrqr95j7";
rev = "9efa18bc9552a8b2a00644f79d41f279be322e45";
sha256 = "0hfq580ng3wlzkc9g44pz1ciwa9ax46ylka3s3y4v79szhviykby";
};
meta.homepage = "https://github.com/mhartington/formatter.nvim/";
};
@ -1823,12 +1823,12 @@ final: prev:
git-worktree-nvim = buildVimPluginFrom2Nix {
pname = "git-worktree-nvim";
version = "2021-05-27";
version = "2021-07-15";
src = fetchFromGitHub {
owner = "ThePrimeagen";
repo = "git-worktree.nvim";
rev = "b036b2f8a0f9cd973ab25292460e0c7b323616ef";
sha256 = "1mn2pwcp482p7rrg0jk8i2g9pql58yqylzpp31308ssw32j8f9fj";
rev = "97adf37032c213201c823e98b0555f7279525d62";
sha256 = "0vca7pyipch3y3g19sfwqx33l8jh3h7r9wv3hlfw960iyqc2xia7";
};
meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/";
};
@ -1883,12 +1883,12 @@ final: prev:
glow-nvim = buildVimPluginFrom2Nix {
pname = "glow-nvim";
version = "2021-07-06";
version = "2021-07-14";
src = fetchFromGitHub {
owner = "npxbr";
repo = "glow.nvim";
rev = "76e834e6c44ac176202a541cb46755303bdcc88d";
sha256 = "0byzim4zl9hgr50qh8caq8d50xkjiplh1kp1jrpmfclzxwzzq3l3";
rev = "3688c38b70eaa680a7100a53e2f12bcd367de225";
sha256 = "18xkgwy3gfaq45wzixpr3ngskqqg0c2nziykvy323fimjvbvqxan";
};
meta.homepage = "https://github.com/npxbr/glow.nvim/";
};
@ -2075,12 +2075,12 @@ final: prev:
hop-nvim = buildVimPluginFrom2Nix {
pname = "hop-nvim";
version = "2021-07-06";
version = "2021-07-13";
src = fetchFromGitHub {
owner = "phaazon";
repo = "hop.nvim";
rev = "3c46b25e2a12544e52c23377c4a0c43ab920ad65";
sha256 = "0sajb93635rxgv5v3bhbakbfpg958vsj8yaln7d91ab87zhbq1zj";
rev = "9c849dac4b8efe6ad30aabec995dabfb5b251046";
sha256 = "0z0ddrqhpirjdck9j0dmaxx0ra5hlcll0iawqb0078xg181bhnwh";
};
meta.homepage = "https://github.com/phaazon/hop.nvim/";
};
@ -2424,12 +2424,12 @@ final: prev:
lazygit-nvim = buildVimPluginFrom2Nix {
pname = "lazygit-nvim";
version = "2021-07-13";
version = "2021-07-14";
src = fetchFromGitHub {
owner = "kdheepak";
repo = "lazygit.nvim";
rev = "d3f6a7f629931880df3c86ef5d123db1eed9c26a";
sha256 = "0z9zsl56ikrk7y9njflj9la2wr5iaxbqp73xay69flgkycsnbpy7";
rev = "3dc36a82276d4ff88badadf3dfdcc34b57d0e0fd";
sha256 = "18sl35wi7zq2y4y4bny5pz160m584c8mli1b6vjvr84gvjmyg7sv";
};
meta.homepage = "https://github.com/kdheepak/lazygit.nvim/";
};
@ -2724,12 +2724,12 @@ final: prev:
lush-nvim = buildVimPluginFrom2Nix {
pname = "lush-nvim";
version = "2021-06-30";
version = "2021-07-15";
src = fetchFromGitHub {
owner = "rktjmp";
repo = "lush.nvim";
rev = "3232af465ed86b9a188389e52ce3c47cd811c3f3";
sha256 = "1qcvi8kklggzl4k88n6zhxb08hh2srhm9vvnfrknlz751pgd8z3x";
rev = "a787bcd1d9afb2bd6bab13834c5b28e727f266c0";
sha256 = "12i4bvgm26sfvdanjjwz1572nfnyax1i2bwawfkz2ab34xlwcr0y";
};
meta.homepage = "https://github.com/rktjmp/lush.nvim/";
};
@ -2808,12 +2808,12 @@ final: prev:
minimap-vim = buildVimPluginFrom2Nix {
pname = "minimap-vim";
version = "2021-07-10";
version = "2021-07-13";
src = fetchFromGitHub {
owner = "wfxr";
repo = "minimap.vim";
rev = "05356257ff2ecd340f01a1f09ebb86be3eccc003";
sha256 = "1s6djj76mghbzqz0sydivfc1jhrwmqq64p4dcigji1jasm2z88fn";
rev = "1db8e5588bfd2038efb690de5991746c8bf03543";
sha256 = "00mpza33p3yybr3fgigx7gy8faj8f5ypdws9aymxs30a12p67d1q";
};
meta.homepage = "https://github.com/wfxr/minimap.vim/";
};
@ -3132,12 +3132,12 @@ final: prev:
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2021-07-12";
version = "2021-07-14";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
rev = "90b1901774c11b86f3d36f7d17803125bfbe82b8";
sha256 = "1fi4dajrhrsfj64bxz9vpd2ipsjnsx51sqc34qg0iw47qraw8yij";
rev = "bf148e2534097988e61ed334edaf31b67134369b";
sha256 = "157k4gbs0r92zwm41hh40gqxc9774g05ngan936ivnnfg5j9igsg";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@ -3180,12 +3180,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
version = "2021-07-12";
version = "2021-07-15";
src = fetchFromGitHub {
owner = "vhyrro";
repo = "neorg";
rev = "4b084b7bdbdec913ba2432c54eb0b5d72183c4ac";
sha256 = "1fngbp7gvfqk0jidll36mvh0ixsrlsr0bh8g2fxy2x9v26zdpw61";
rev = "4a6eb9d52d544d378c82f17c448eb9c697cf448c";
sha256 = "14hsyy23xb5p8lfna3kiarr0na1n1bykr8scwslczhpi9fwcgq85";
};
meta.homepage = "https://github.com/vhyrro/neorg/";
};
@ -3288,12 +3288,12 @@ final: prev:
nerdtree = buildVimPluginFrom2Nix {
pname = "nerdtree";
version = "2021-03-25";
version = "2021-07-15";
src = fetchFromGitHub {
owner = "preservim";
repo = "nerdtree";
rev = "81f3eaba295b3fceb2d032db57e5eae99ae480f8";
sha256 = "0zws0b20n8ak2s3hffsb0rrwdjh8sx3sgrilmmmvr0d2ivsfqwlb";
rev = "2c14ed0e153cdcd0a1c7d1eabec6820bb6b3f8a2";
sha256 = "0gny5xw4knvjlkgazygpkwy8fk2x8igh45f980ypjghfkiw8h5f8";
};
meta.homepage = "https://github.com/preservim/nerdtree/";
};
@ -3444,12 +3444,12 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
version = "2021-07-11";
version = "2021-07-14";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
rev = "6b10db9b39fbdb696dc354cc81b0102a04f36668";
sha256 = "0pbpf3im0z13h6q4labp5qmlgg78pgfn3yba0dnsqkzmh2p66fav";
rev = "e599e15f9400e6b587e3160d2dff83764cb4ab7d";
sha256 = "08mn2z6q94x8fwic9r0vhzw0y93sm9ww6z458bd9hsxibfjsklgc";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
@ -3492,12 +3492,12 @@ final: prev:
nvim-bufferline-lua = buildVimPluginFrom2Nix {
pname = "nvim-bufferline-lua";
version = "2021-07-05";
version = "2021-07-15";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-bufferline.lua";
rev = "d66f0e45243a46fc3fd0d84ed7d54e37882207ba";
sha256 = "0rwihzz2lcyza86bgmmvny685g1nlz23yagz5agdqjzibqz973xf";
rev = "cebafb95622205a414a6c10bf0e40d197cc652b1";
sha256 = "1qd8gaigkyhkz5nrizc3jhwa69v4fcymd2446l0s24pv3kxc2an3";
};
meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
};
@ -3528,12 +3528,12 @@ final: prev:
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
version = "2021-07-13";
version = "2021-07-14";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
rev = "a3e530ea915634afb43b21e621d45515f7bdff77";
sha256 = "1dx95vnwz65d07irb3c6dy7nkalmfla501dwcyhyk3zygws50zaw";
rev = "29879b29b63fcd315e247a110a505e6a337b584a";
sha256 = "18ybvc2l07l91gkl3w63l58pm9q7bx2p0fmkyxpqb48cii98n4yj";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@ -3552,12 +3552,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2021-07-11";
version = "2021-07-14";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "55f2737dcfb2f0d846623ae3996cf141bb692fab";
sha256 = "10g1qbknzh6b5nfh316976s2blqamivgi6gpwpydsdsnc59pshdz";
rev = "344b6f0b581dd72e40bbbb78b4f147e5003e0ce6";
sha256 = "1xdcdwjqk2r2cg47gxld2c06yfnbpj6nnm2j5nskqa3nbyrpf27c";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@ -3660,12 +3660,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2021-07-13";
version = "2021-07-15";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "bc7796a5fd8a9c0373413105f0fbd5ea44583538";
sha256 = "0qz8pqbj9ijd1qp16fqr4q7fpdjb6j0574q8bsp3lg3x8355skzy";
rev = "9d49032a64d8a275123ad7f84e9c699d279307fe";
sha256 = "18z22v8qn6jhg16hsrldqaqqp987w1nnqz0lhn0byzbsac62xwga";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -3756,12 +3756,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2021-07-11";
version = "2021-07-14";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "647268183f8eb164bf8c94ec1c87634f51f5c34a";
sha256 = "1xf4px6vsxm623dvj7jgd0i73k1a9k5rq7jjz7azd0mv54dm5hbj";
rev = "d779ee79f0426711f84b770bf6ff4afda4f41c1e";
sha256 = "0svnb4fsqsjhlqcikq0kgrwyrqfqplgvx93mhw1qhpmwfbgqn6vi";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -3820,8 +3820,8 @@ final: prev:
src = fetchFromGitHub {
owner = "p00f";
repo = "nvim-ts-rainbow";
rev = "802a9d576d836531447f29423fe15abce19d82f7";
sha256 = "19ww2r4jzmwp4pb2c78aj7jp8a93s25nmlxgzfgb7hpixg8q16p0";
rev = "15e8a45517c596b9acd9406bcb6f650d6bfdb339";
sha256 = "1m1bc5w1qw8cxjnhhanh7rw78d3zkdxm6vgldh22zhmvgj1cb7zl";
};
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
};
@ -3972,12 +3972,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
version = "2021-07-13";
version = "2021-07-15";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
rev = "3a48ecad19a111b629cc5c5afa62d0513e440dc6";
sha256 = "1ngm3c5piivxzsx05p1bzyac9rlsy050qzlwq1zvc15zz70gfkk0";
rev = "d693133efb4a1f171d581dad8d399d6a3cd4b90a";
sha256 = "1avcdfsq14nqbqrvlgz7cslaxi1ni5lsvz78dj5xc35ppgwyr1ci";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@ -4068,12 +4068,12 @@ final: prev:
playground = buildVimPluginFrom2Nix {
pname = "playground";
version = "2021-07-11";
version = "2021-07-13";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "playground";
rev = "d9a9b44e6de4d8b5326317432c91c7f6508269f7";
sha256 = "10c1h1xs2s2wijhpil88fr5rhzibsg568960pqga24ms9rs2qy44";
rev = "2715d35f27cbdfe6231e48212d12be383013f442";
sha256 = "0z1vlsdmhlw6pbga9nypsihzjybglyr8is3maqbyqswrmz1yg87h";
};
meta.homepage = "https://github.com/nvim-treesitter/playground/";
};
@ -4417,12 +4417,12 @@ final: prev:
rust-tools-nvim = buildVimPluginFrom2Nix {
pname = "rust-tools-nvim";
version = "2021-07-07";
version = "2021-07-14";
src = fetchFromGitHub {
owner = "simrat39";
repo = "rust-tools.nvim";
rev = "0bf6e0986ddc5677a6ca60a59624e49234c368a5";
sha256 = "0anvnb1szy2w5dsvnznkdcppmcn6sd2d1419ny0bv3hb4bg07jcy";
rev = "da8fb66af44fe2472b58fbf0b83ad4fe2243aaea";
sha256 = "0mkjb42ff0w80kbik6hwdx1hvhxlihq17fqypdagmxk58wn71z9y";
};
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
};
@ -4501,12 +4501,12 @@ final: prev:
semshi = buildVimPluginFrom2Nix {
pname = "semshi";
version = "2019-12-01";
version = "2021-07-13";
src = fetchFromGitHub {
owner = "numirias";
repo = "semshi";
rev = "801d0c971d3d7291cf2fc22d74ac69155a71a279";
sha256 = "0adq1qxlxd53ps5byjvqmzk266f3wbvqmw74dkx6vd41zqw38wfx";
rev = "39c7500032f35711aecb492affd989433b984f14";
sha256 = "14hv67fhmq85m382grc6h07r5xs83mmx3j8nf94j60gwbybhlkdb";
};
meta.homepage = "https://github.com/numirias/semshi/";
};
@ -4561,12 +4561,12 @@ final: prev:
sideways-vim = buildVimPluginFrom2Nix {
pname = "sideways-vim";
version = "2021-06-24";
version = "2021-07-15";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "sideways.vim";
rev = "8703f642db4e545525e6fb10e97c843c74c61964";
sha256 = "1rmrxr53i7vmwh7wrrbcb24jyrqrph6bqr2bifhhgwy1kxx04gvg";
rev = "960afef88aef374d3525e1536bdd505727b42d67";
sha256 = "08yj3p31d5gnd3qyv6dcpz87s3kwz1kgcb5h92w83wf64r6fzq61";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
@ -4899,12 +4899,12 @@ final: prev:
tabnine-vim = buildVimPluginFrom2Nix {
pname = "tabnine-vim";
version = "2021-07-12";
version = "2021-07-14";
src = fetchFromGitHub {
owner = "codota";
repo = "tabnine-vim";
rev = "4c22054dffdd84811664cb6957b001a8617333ae";
sha256 = "16r27kzpk4xww82x18m6m0hwbplsdw96vcmkyy9r6ndxq0hcblqi";
rev = "e431d0425f4b132caef736ab682ba917edee30e9";
sha256 = "17d5qa5y809sss4rk5gl75fxbh04nychjgpag6xjd8fzwd51xmzr";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/codota/tabnine-vim/";
@ -5008,12 +5008,12 @@ final: prev:
telescope-frecency-nvim = buildVimPluginFrom2Nix {
pname = "telescope-frecency-nvim";
version = "2021-04-17";
version = "2021-07-14";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-frecency.nvim";
rev = "721300e3d6f4a7157a781014d3d69bb1c7b702a3";
sha256 = "1981lfk7xckvf2jmhnnrb58iwb1s3qzz84g52h4rvbjr7dbrr4xk";
rev = "5173a42d4a306567a90c41fb90ee660a3274d34f";
sha256 = "0baphixbfwq3fd3wcxf1fjgb7qwr7l0p6c8rpqf80msb0d7ikv77";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
};
@ -5069,12 +5069,12 @@ final: prev:
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
version = "2021-07-11";
version = "2021-07-14";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "5692edd004fed1dbd55c90775c34a051298724e7";
sha256 = "0mzgbnm9ic173spnm9w9da7yl79fqg6p7s1sv0w3d3m7qqvz0bpz";
rev = "37a3a68a78e15900254ae5d9d4f9f0b5100a1735";
sha256 = "1a5hsjsz62nb5hlrd0k8wbcnyxa3574jgipphs9s2llf6qfwkfh1";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@ -5272,6 +5272,18 @@ final: prev:
meta.homepage = "https://github.com/Quramy/tsuquyomi/";
};
twilight-nvim = buildVimPluginFrom2Nix {
pname = "twilight-nvim";
version = "2021-07-13";
src = fetchFromGitHub {
owner = "folke";
repo = "twilight.nvim";
rev = "f5718ddbd9bba3184493a4fc11cd38342966904f";
sha256 = "1j532h0imw782rvhg75ryqmy5lm0clg32fs3a1cm84srx97l05fp";
};
meta.homepage = "https://github.com/folke/twilight.nvim/";
};
typescript-vim = buildVimPluginFrom2Nix {
pname = "typescript-vim";
version = "2020-12-08";
@ -5658,12 +5670,12 @@ final: prev:
vim-airline-themes = buildVimPluginFrom2Nix {
pname = "vim-airline-themes";
version = "2021-05-18";
version = "2021-07-13";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline-themes";
rev = "531bcc9e5a4cb1b1fb4dec8face230bf3d205ac7";
sha256 = "05yapm3g9rj7k69dhlm7hspakbczwwlbx1lcdydvkx639ka7j09d";
rev = "97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256";
sha256 = "0cbxjb1q7xlxykzq4ab4n3ny768ysf97f7h7d9spfmw286j3c2wi";
};
meta.homepage = "https://github.com/vim-airline/vim-airline-themes/";
};
@ -5886,12 +5898,12 @@ final: prev:
vim-capslock = buildVimPluginFrom2Nix {
pname = "vim-capslock";
version = "2019-11-13";
version = "2021-07-13";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-capslock";
rev = "84c9e467a7b8e5aabf33674ed17c6356cf98777c";
sha256 = "1c2fr8s9im3vxrszsrzm6wvad6disbdslmq6lqdp4603ialy4kja";
rev = "a910e686986b239a7885e67ab6914638f88e914b";
sha256 = "0aiqs4m5vfc22lcjkb2iphpb2qi7bz994lbjr2frsb8g8h508h18";
};
meta.homepage = "https://github.com/tpope/vim-capslock/";
};
@ -6654,12 +6666,12 @@ final: prev:
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
version = "2021-07-10";
version = "2021-07-14";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
rev = "f1bace622bcb0e81c5aa41fc663de5c0c34d54f4";
sha256 = "0f8dzv3rdlzmcmd5j71rsvqa95dznc56kj2k9ynakn28lcvpjvyc";
rev = "daf9389e827dd19d804ffaad19cc8b64e389da6c";
sha256 = "0kcjfi61md9n0fgnypamvqsc9k4mykr9wx978qna2xjb19vfkvad";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@ -7761,12 +7773,12 @@ final: prev:
vim-mundo = buildVimPluginFrom2Nix {
pname = "vim-mundo";
version = "2021-07-09";
version = "2021-07-13";
src = fetchFromGitHub {
owner = "simnalamburt";
repo = "vim-mundo";
rev = "b662ebc5fb5f995d8565aa3f2cb5c48fa018bbd7";
sha256 = "0l2a5cl6j1bmxc536893dfy7dcgrmzb70lh4wj1bd4nms409wrqx";
rev = "8b4bccebf7a16938c77073983d643ba22aa04079";
sha256 = "11livwi2pvnrxj7mildh46a6rli6hibpbffc9a5q6vxkvn9s6v29";
};
meta.homepage = "https://github.com/simnalamburt/vim-mundo/";
};
@ -9598,12 +9610,12 @@ final: prev:
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
version = "2021-07-04";
version = "2021-07-13";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
rev = "da39c4955c2ad0ffa28f5cba81651b568697629c";
sha256 = "02c7kxfalp52k2ij5r6hjnvqd2azkhx9sglqr85bc53rvh1rgi7y";
rev = "9c806d2a014a21ef4bce49a18791d04e1a66bdf7";
sha256 = "0imqzcdw28d5nmv2837x1m07pmir1yh9zbf52nsnvibw09z26kg8";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@ -9611,12 +9623,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2021-07-12";
version = "2021-07-15";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "a064c48ade2a4df3d010e02b2d528fc2534a62eb";
sha256 = "03za8pwaqi2bhkq9zgial6fpipkbij530f54alaqc8mrd6nydz90";
rev = "431f520553bfe721d1ef5db0bb23ec03a86c00a0";
sha256 = "1a9j27404hi8s3v7h9kghl7xwgmcblbranlp6kclvvrl7wahvnhg";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};

View file

@ -152,6 +152,7 @@ folke/lsp-colors.nvim@main
folke/todo-comments.nvim@main
folke/tokyonight.nvim@main
folke/trouble.nvim@main
folke/twilight.nvim@main
folke/which-key.nvim@main
freitass/todo.txt-vim
frigoeu/psc-ide-vim

View file

@ -5,6 +5,7 @@
, enablePAM ? false, pam
, enableSPF ? true, libspf2
, enableDMARC ? true, opendmarc
, enableRedis ? false, hiredis
}:
stdenv.mkDerivation rec {
@ -23,7 +24,8 @@ stdenv.mkDerivation rec {
++ lib.optional enableAuthDovecot dovecot
++ lib.optional enablePAM pam
++ lib.optional enableSPF libspf2
++ lib.optional enableDMARC opendmarc;
++ lib.optional enableDMARC opendmarc
++ lib.optional enableRedis hiredis;
preBuild = ''
sed '
@ -78,6 +80,13 @@ stdenv.mkDerivation rec {
s:^# \(SUPPORT_DMARC\)=.*:\1=yes:
s:^# \(LDFLAGS += -lopendmarc\):\1:
''}
${lib.optionalString enableRedis ''
s:^# \(LOOKUP_REDIS=yes\)$:\1:
s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lhiredis -L${hiredis}/lib/hiredis:
s:^# \(LOOKUP_LIBS\)=.*:\1=-lhiredis -L${hiredis}/lib/hiredis:
s:^\(LOOKUP_INCLUDE\)=\(.*\):\1=\2 -I${hiredis}/include/hiredis/:
s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${hiredis}/include/hiredis/:
''}
#/^\s*#.*/d
#/^\s*$/d
' < src/EDITME > Local/Makefile

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, cmake
, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk
, libGL, libGLU, libXv, libXtst, libXi, libjpeg_turbo, fltk
, xorg
, opencl-headers, opencl-clhpp, ocl-icd
}:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ libjpeg_turbo libGL libGLU fltk
libX11 libXv libXtst xorg.xcbutilkeysyms
libXv libXtst libXi xorg.xcbutilkeysyms
opencl-headers opencl-clhpp ocl-icd
];

View file

@ -0,0 +1,28 @@
{ stdenv
, lib
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
pname = "afetch";
version = "2.2.0";
src = fetchFromGitHub {
owner = "13-CF";
repo = "afetch";
rev = "V${version}";
sha256 = "sha256-bHP3DJpgh89AaCX4c1tQGaZ/PiWjArED1rMdszFUq+U=";
};
makeFlags = [
"PREFIX=${placeholder "out"}"
];
meta = with lib; {
description = "A fetch program written in C";
homepage = "https://github.com/13-CF/afetch";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dan4ik605743 jk ];
platforms = platforms.linux;
};
}

View file

@ -39,7 +39,7 @@ let
canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild);
inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems);
version = "2.06-rc1";
version = "2.06";
in (
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.savannah.gnu.org/grub.git";
rev = "${pname}-${version}";
sha256 = "1ngc960g4w91rg13l724v6nlj6fq1adxp6is2mrq4bnp7sm9mysa";
sha256 = "1vkxr6b4p7h259vayjw8bfgqj57x68byy939y4bmyaz6g7fgrv0f";
};
patches = [

View file

@ -1,17 +1,33 @@
{ lib, rustPlatform, fetchFromGitHub }:
{ lib, stdenv, rustPlatform, fetchFromGitHub
, makeWrapper
, nix
, openssl
, pkg-config
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "nix-template";
version = "0.1.0";
version = "0.1.1";
src = fetchFromGitHub {
owner = "jonringer";
repo = pname;
rev = "v${version}";
sha256 = "1h6xdvhzg7nb0s82b3r5bsh8bfdb1l5sm7fa24lfwd396xp9yyig";
sha256 = "sha256-A1b/fgSr27sfMDnTi4R3PUZfhAdLA5wUOd4yh9/4Bnk=";
};
cargoSha256 = "0hp31b5q4s6grkha2jz55945cbjkqdpvx1l8m49zv5prczhd7mz5";
cargoSha256 = "sha256-resyY/moqLo4KWOKUvFJiOWealCmcEsLFgkN12slKN0=";
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = [ openssl ]
++ lib.optional stdenv.isDarwin Security;
# needed for nix-prefetch-url
postInstall = ''
wrapProgram $out/bin/nix-template \
--prefix PATH : ${lib.makeBinPath [ nix ]}
'';
meta = with lib; {
description = "Make creating nix expressions easy";

View file

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, PCSC }:
{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, PCSC, pivKeySupport ? true }:
buildGoModule rec {
pname = "cosign";
@ -12,8 +12,8 @@ buildGoModule rec {
};
buildInputs =
lib.optional stdenv.isLinux (lib.getDev pcsclite)
++ lib.optionals stdenv.isDarwin [ PCSC ];
lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
++ lib.optionals (stdenv.isDarwin && pivKeySupport) [ PCSC ];
nativeBuildInputs = [ pkg-config ];
@ -21,6 +21,9 @@ buildGoModule rec {
subPackages = [ "cmd/cosign" ];
preBuild = ''
buildFlagsArray+=(${lib.optionalString pivKeySupport "-tags=pivkey"})
'';
ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}"];
meta = with lib; {

View file

@ -808,6 +808,8 @@ in
afew = callPackage ../applications/networking/mailreaders/afew { };
afetch = callPackage ../tools/misc/afetch { };
afio = callPackage ../tools/archivers/afio { };
afl = callPackage ../tools/security/afl {
@ -1237,6 +1239,8 @@ in
azure-cli = callPackage ../tools/admin/azure-cli { };
azure-functions-core-tools = callPackage ../development/tools/azure-functions-core-tools { };
azure-storage-azcopy = callPackage ../development/tools/azcopy { };
azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { };
@ -1323,6 +1327,8 @@ in
inherit (nodePackages) bitwarden-cli;
inherit (nodePackages) hyperspace-cli;
bkyml = callPackage ../tools/misc/bkyml { };
blockbench-electron = callPackage ../applications/graphics/blockbench-electron { };
@ -3091,7 +3097,9 @@ in
nix-output-monitor = haskell.lib.justStaticExecutables (haskellPackages.nix-output-monitor);
nix-template = callPackage ../tools/package-management/nix-template { };
nix-template = callPackage ../tools/package-management/nix-template {
inherit (darwin.apple_sdk.frameworks) Security;
};
nodepy-runtime = with python3.pkgs; toPythonApplication nodepy-runtime;
@ -15102,12 +15110,27 @@ in
flite = callPackage ../development/libraries/flite { };
fltk13 = callPackage ../development/libraries/fltk {
inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT;
inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa OpenGL;
};
fltk14 = callPackage ../development/libraries/fltk/1.4.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT;
inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa OpenGL;
};
fltk = res.fltk13;
fltk13-minimal = fltk13.override {
withGL = false;
withCairo = false;
withPango = false;
withExamples = false;
withDocs = false;
};
fltk14-minimal = fltk14.override {
withGL = false;
withCairo = false;
withPango = false;
withExamples = false;
withDocs = false;
};
fltk = fltk13;
fltk-minimal = fltk13-minimal;
flyway = callPackage ../development/tools/flyway { };
@ -23162,8 +23185,9 @@ in
inherit (pkgs) bitwig-studio1;
};
bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { };
bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix { };
bitwig-studio = bitwig-studio3;
bitwig-studio = bitwig-studio4;
bgpdump = callPackage ../tools/networking/bgpdump { };
@ -25851,6 +25875,8 @@ in
nwg-panel = callPackage ../applications/misc/nwg-panel { };
nwg-wrapper = callPackage ../applications/misc/nwg-wrapper { };
ocenaudio = callPackage ../applications/audio/ocenaudio { };
onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { };
@ -28509,6 +28535,10 @@ in
boost = boost17x;
};
oxen = callPackage ../applications/blockchains/oxen {
boost = boost17x;
};
monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui {
boost = boost17x;
};
@ -28803,7 +28833,9 @@ in
exult = callPackage ../games/exult { };
fltrator = callPackage ../games/fltrator { };
fltrator = callPackage ../games/fltrator {
fltk = fltk-minimal;
};
factorio = callPackage ../games/factorio { releaseType = "alpha"; };

View file

@ -630,6 +630,8 @@ let
lwt-dllist = callPackage ../development/ocaml-modules/lwt-dllist { };
lwt-watcher = callPackage ../development/ocaml-modules/lwt-watcher { };
lwt_log = callPackage ../development/ocaml-modules/lwt_log { };
lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { };

View file

@ -80,12 +80,16 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // {
kde2-decoration = callPackage ../data/themes/kde2 { };
kcolorpicker = callPackage ../development/libraries/kcolorpicker { };
kdiagram = callPackage ../development/libraries/kdiagram { };
kdsoap = callPackage ../development/libraries/kdsoap { };
kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { };
kimageannotator = callPackage ../development/libraries/kimageannotator { };
kproperty = callPackage ../development/libraries/kproperty { };
kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { };