Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2021-07-16 00:05:27 +00:00 committed by GitHub
commit 049494e76e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
164 changed files with 16197 additions and 1392 deletions

View file

@ -18,6 +18,8 @@
Additional commands to be executed for finalizing the derivation with runner script. Additional commands to be executed for finalizing the derivation with runner script.
- `runScript` - `runScript`
A command that would be executed inside the sandbox and passed all the command line arguments. It defaults to `bash`. 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: One can create a simple environment using a `shell.nix` like that:

View file

@ -10678,6 +10678,16 @@
githubId = 9853194; githubId = 9853194;
name = "Philipp Bartsch"; name = "Philipp Bartsch";
}; };
toastal = {
email = "toastal+nix@posteo.net";
github = "toastal";
githubId = 561087;
name = "toastal";
keys = [{
longkeyid = "ed25519/5CCE6F1466D47C9E";
fingerprint = "7944 74B7 D236 DAB9 C9EF E7F9 5CCE 6F14 66D4 7C9E";
}];
};
tobim = { tobim = {
email = "nix@tobim.fastmail.fm"; email = "nix@tobim.fastmail.fm";
github = "tobim"; github = "tobim";
@ -11878,12 +11888,6 @@
githubId = 8686360; githubId = 8686360;
name = "Illia Shestakov"; name = "Illia Shestakov";
}; };
foxit64 = {
email = "o4nsxy05@gmail.com";
github = "foxit64";
githubId = 56247270;
name = "Foxit";
};
masaeedu = { masaeedu = {
email = "masaeedu@gmail.com"; email = "masaeedu@gmail.com";
github = "masaeedu"; github = "masaeedu";

View file

@ -486,7 +486,7 @@
</itemizedlist> </itemizedlist>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<itemizedlist spacing="compact"> <itemizedlist>
<listitem> <listitem>
<para> <para>
<literal>yggdrasil</literal> was upgraded to a new major <literal>yggdrasil</literal> was upgraded to a new major
@ -495,6 +495,14 @@
changelog</link>. changelog</link>.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
<literal>icingaweb2</literal> was upgraded to a new release
which requires a manual database upgrade, see
<link xlink:href="https://github.com/Icinga/icingaweb2/releases/tag/v2.9.0">upstream
changelog</link>.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
<section xml:id="sec-release-21.11-notable-changes"> <section xml:id="sec-release-21.11-notable-changes">

View file

@ -124,6 +124,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `yggdrasil` was upgraded to a new major release with breaking changes, see [upstream changelog](https://github.com/yggdrasil-network/yggdrasil-go/releases/tag/v0.4.0). - `yggdrasil` was upgraded to a new major release with breaking changes, see [upstream changelog](https://github.com/yggdrasil-network/yggdrasil-go/releases/tag/v0.4.0).
- `icingaweb2` was upgraded to a new release which requires a manual database upgrade, see [upstream changelog](https://github.com/Icinga/icingaweb2/releases/tag/v2.9.0).
## Other Notable Changes {#sec-release-21.11-notable-changes} ## Other Notable Changes {#sec-release-21.11-notable-changes}
- The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.

View file

@ -10,14 +10,16 @@ in
{ {
options.programs.xwayland = { options.programs.xwayland = {
enable = mkEnableOption '' enable = mkEnableOption "Xwayland (an X server for interfacing X11 apps with the Wayland protocol)";
Xwayland X server allows running X programs on a Wayland compositor.
'';
defaultFontPath = mkOption { defaultFontPath = mkOption {
type = types.str; type = types.str;
default = optionalString config.fonts.fontDir.enable default = optionalString config.fonts.fontDir.enable
"/run/current-system/sw/share/X11/fonts"; "/run/current-system/sw/share/X11/fonts";
defaultText = literalExample ''
optionalString config.fonts.fontDir.enable
"/run/current-system/sw/share/X11/fonts";
'';
description = '' description = ''
Default font path. Setting this option causes Xwayland to be rebuilt. Default font path. Setting this option causes Xwayland to be rebuilt.
''; '';
@ -25,7 +27,15 @@ in
package = mkOption { package = mkOption {
type = types.path; type = types.path;
description = "The Xwayland package"; default = pkgs.xwayland.override (oldArgs: {
inherit (cfg) defaultFontPath;
});
defaultText = literalExample ''
pkgs.xwayland.override (oldArgs: {
inherit (config.programs.xwayland) defaultFontPath;
});
'';
description = "The Xwayland package to use.";
}; };
}; };
@ -37,9 +47,5 @@ in
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [ cfg.package ];
programs.xwayland.package = pkgs.xwayland.override (oldArgs: {
inherit (cfg) defaultFontPath;
});
}; };
} }

View file

@ -35,10 +35,20 @@ in
token = mkOption { token = mkOption {
type = types.str; type = types.str;
description = "The k3s token to use when connecting to the server. This option only makes sense for an agent."; description = ''
The k3s token to use when connecting to the server. This option only makes sense for an agent.
WARNING: This option will expose store your token unencrypted world-readable in the nix store.
If this is undesired use the tokenFile option instead.
'';
default = ""; default = "";
}; };
tokenFile = mkOption {
type = types.nullOr types.path;
description = "File path containing k3s token to use when connecting to the server. This option only makes sense for an agent.";
default = null;
};
docker = mkOption { docker = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -68,8 +78,8 @@ in
message = "serverAddr should be set if role is 'agent'"; message = "serverAddr should be set if role is 'agent'";
} }
{ {
assertion = cfg.role == "agent" -> cfg.token != ""; assertion = cfg.role == "agent" -> cfg.token != "" || cfg.tokenFile != null;
message = "token should be set if role is 'agent'"; message = "token or tokenFile should be set if role is 'agent'";
} }
]; ];
@ -105,7 +115,12 @@ in
"${cfg.package}/bin/k3s ${cfg.role}" "${cfg.package}/bin/k3s ${cfg.role}"
] ++ (optional cfg.docker "--docker") ] ++ (optional cfg.docker "--docker")
++ (optional cfg.disableAgent "--disable-agent") ++ (optional cfg.disableAgent "--disable-agent")
++ (optional (cfg.role == "agent") "--server ${cfg.serverAddr} --token ${cfg.token}") ++ (optional (cfg.role == "agent") "--server ${cfg.serverAddr} ${
if cfg.tokenFile != null then
"--token-file ${cfg.tokenFile}"
else
"--token ${cfg.token}"
}")
++ [ cfg.extraFlags ] ++ [ cfg.extraFlags ]
); );
}; };

View file

@ -475,21 +475,16 @@ in
plugins = lib.mkOption { plugins = lib.mkOption {
type = lib.types.listOf lib.types.package; type = lib.types.listOf lib.types.package;
default = []; default = [];
example = '' example = lib.literalExample ''
[ with config.services.discourse.package.plugins; [
(pkgs.fetchFromGitHub { discourse-canned-replies
owner = "discourse"; discourse-github
repo = "discourse-spoiler-alert";
rev = "e200cfa571d252cab63f3d30d619b370986e4cee";
sha256 = "0ya69ix5g77wz4c9x9gmng6l25ghb5xxlx3icr6jam16q14dzc33";
})
]; ];
''; '';
description = '' description = ''
<productname>Discourse</productname> plugins to install as a Plugins to install as part of
list of derivations. As long as a plugin supports the <productname>Discourse</productname>, expressed as a list of
standard install method, packaging it should only require derivations.
fetching its source with an appropriate fetcher.
''; '';
}; };

View file

@ -262,9 +262,31 @@ services.discourse = {
<para> <para>
You can install <productname>Discourse</productname> plugins You can install <productname>Discourse</productname> plugins
using the <xref linkend="opt-services.discourse.plugins" /> using the <xref linkend="opt-services.discourse.plugins" />
option. As long as a plugin supports the standard install option. Pre-packaged plugins are provided in
method, packaging it should only require fetching its source <literal>&lt;your_discourse_package_here&gt;.plugins</literal>. If
with an appropriate fetcher. you want the full suite of plugins provided through
<literal>nixpkgs</literal>, you can also set the <xref
linkend="opt-services.discourse.package" /> option to
<literal>pkgs.discourseAllPlugins</literal>.
</para>
<para>
Plugins can be built with the
<literal>&lt;your_discourse_package_here&gt;.mkDiscoursePlugin</literal>
function. Normally, it should suffice to provide a
<literal>name</literal> and <literal>src</literal> attribute. If
the plugin has Ruby dependencies, however, they need to be
packaged in accordance with the <link
xlink:href="https://nixos.org/manual/nixpkgs/stable/#developing-with-ruby">Developing
with Ruby</link> section of the Nixpkgs manual and the
appropriate gem options set in <literal>bundlerEnvArgs</literal>
(normally <literal>gemdir</literal> is sufficient). A plugin's
Ruby dependencies are listed in its
<filename>plugin.rb</filename> file as function calls to
<literal>gem</literal>. To construct the corresponding
<filename>Gemfile</filename>, run <command>bundle
init</command>, then add the <literal>gem</literal> lines to it
verbatim.
</para> </para>
<para> <para>
@ -280,7 +302,10 @@ services.discourse = {
<para> <para>
For example, to add the <link For example, to add the <link
xlink:href="https://github.com/discourse/discourse-spoiler-alert">discourse-spoiler-alert</link> xlink:href="https://github.com/discourse/discourse-spoiler-alert">discourse-spoiler-alert</link>
plugin and disable it by default: and <link
xlink:href="https://github.com/discourse/discourse-solved">discourse-solved</link>
plugins, and disable <literal>discourse-spoiler-alert</literal>
by default:
<programlisting> <programlisting>
services.discourse = { services.discourse = {
@ -301,13 +326,9 @@ services.discourse = {
<link linkend="opt-services.discourse.mail.outgoing.passwordFile">passwordFile</link> = "/path/to/smtp_password_file"; <link linkend="opt-services.discourse.mail.outgoing.passwordFile">passwordFile</link> = "/path/to/smtp_password_file";
}; };
<link linkend="opt-services.discourse.mail.incoming.enable">mail.incoming.enable</link> = true; <link linkend="opt-services.discourse.mail.incoming.enable">mail.incoming.enable</link> = true;
<link linkend="opt-services.discourse.mail.incoming.enable">plugins</link> = [ <link linkend="opt-services.discourse.mail.incoming.enable">plugins</link> = with config.services.discourse.package.plugins; [
(pkgs.fetchFromGitHub { discourse-spoiler-alert
owner = "discourse"; discourse-solved
repo = "discourse-spoiler-alert";
rev = "e200cfa571d252cab63f3d30d619b370986e4cee";
sha256 = "0ya69ix5g77wz4c9x9gmng6l25ghb5xxlx3icr6jam16q14dzc33";
})
]; ];
<link linkend="opt-services.discourse.siteSettings">siteSettings</link> = { <link linkend="opt-services.discourse.siteSettings">siteSettings</link> = {
plugins = { plugins = {

View file

@ -23,6 +23,16 @@ in {
''; '';
}; };
libraryPaths = mkOption {
type = attrsOf package;
default = { };
description = ''
Libraries to add to the Icingaweb2 library path.
The name of the attribute is the name of the library, the value
is the package to add.
'';
};
virtualHost = mkOption { virtualHost = mkOption {
type = nullOr str; type = nullOr str;
default = "icingaweb2"; default = "icingaweb2";
@ -167,6 +177,9 @@ in {
services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
${poolName} = { ${poolName} = {
user = "icingaweb2"; user = "icingaweb2";
phpEnv = {
ICINGAWEB_LIBDIR = toString (pkgs.linkFarm "icingaweb2-libdir" (mapAttrsToList (name: path: { inherit name path; }) cfg.libraryPaths));
};
phpPackage = pkgs.php.withExtensions ({ enabled, all }: [ all.imagick ] ++ enabled); phpPackage = pkgs.php.withExtensions ({ enabled, all }: [ all.imagick ] ++ enabled);
phpOptions = '' phpOptions = ''
date.timezone = "${cfg.timezone}" date.timezone = "${cfg.timezone}"
@ -184,6 +197,11 @@ in {
}; };
}; };
services.icingaweb2.libraryPaths = {
ipl = pkgs.icingaweb2-ipl;
thirdparty = pkgs.icingaweb2-thirdparty;
};
systemd.services."phpfpm-${poolName}".serviceConfig.ReadWritePaths = [ "/etc/icingaweb2" ]; systemd.services."phpfpm-${poolName}".serviceConfig.ReadWritePaths = [ "/etc/icingaweb2" ];
services.nginx = { services.nginx = {

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

View file

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

View file

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

View file

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, fetchpatch
, ghostscript , ghostscript
, libpng , libpng
, makeWrapper , makeWrapper
@ -20,6 +21,15 @@ stdenv.mkDerivation rec {
sha256 = "1bm75lf9j54qpbjx8hzp6ixaayp1x9w4v3yxl6vxyw8g5m4sqdk3"; sha256 = "1bm75lf9j54qpbjx8hzp6ixaayp1x9w4v3yxl6vxyw8g5m4sqdk3";
}; };
patches = [
(fetchpatch {
name = "CVE-2021-3561.patch";
# Using Debian patch since it is not possible to download it directly from Sourceforge
url = "https://sources.debian.org/data/main/f/fig2dev/1:3.2.8-3/debian/patches/33_sanitize-color.patch";
sha256 = "1bppr3li03nj4qjibnddr2f38mpk55pcn5z6k98pf00gabq33fgs";
})
];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ libpng ]; buildInputs = [ libpng ];

View file

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

View file

@ -1,24 +1,26 @@
{ { mkDerivation, lib
mkDerivation, lib, , extra-cmake-modules, kdoctools
extra-cmake-modules, kdoctools, , ki18n, xcb-util-cursor
ki18n, xcb-util-cursor, , kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins
kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins, , knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi
knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, , qtbase, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
qtx11extras, knewstuff, kwayland, qttools
}: }:
mkDerivation { mkDerivation {
pname = "spectacle"; pname = "spectacle";
meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
knewstuff kwayland knewstuff kwayland kcolorpicker kimageannotator
]; ];
postPatch = '' postPatch = ''
substituteInPlace desktop/org.kde.spectacle.desktop.cmake \ substituteInPlace desktop/org.kde.spectacle.desktop.cmake \
--replace "Exec=@QtBinariesDir@/qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" --replace "Exec=@QtBinariesDir@/qdbus" "Exec=${lib.getBin qttools}/bin/qdbus"
''; '';
propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; 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 { buildPythonApplication rec {
pname = "archivy"; pname = "archivy";
version = "1.3.1"; version = "1.4.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-g7H22zJOQuxSmoJ3373eRcbderC67vkuiLN1CgaytFM="; sha256 = "sha256-wQuR7cltDLr2u8BQ851MSjKmeLW8mQ/3bdEF5c9nxL0=";
}; };
# Relax some dependencies # Relax some dependencies
@ -38,7 +38,10 @@ buildPythonApplication rec {
--replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \ --replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \
--replace 'requests ==' 'requests >=' \ --replace 'requests ==' 'requests >=' \
--replace 'validators ==' 'validators >=' \ --replace 'validators ==' 'validators >=' \
--replace 'tinydb ==' 'tinydb >=' --replace 'tinydb ==' 'tinydb >=' \
--replace 'Flask_WTF == 0.14.3' 'Flask_WTF' \
--replace 'Werkzeug ==' 'Werkzeug >=' \
--replace 'Flask ==' 'Flask >='
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -36,7 +36,7 @@ buildGoModule rec {
description = "Command line todo list with super-reliable git sync"; description = "Command line todo list with super-reliable git sync";
homepage = src.meta.homepage; homepage = src.meta.homepage;
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ stianlagstad foxit64 ]; maintainers = with maintainers; [ stianlagstad ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

View file

@ -19,7 +19,6 @@ buildGoModule rec {
description = "A simple text-based Minecraft modpack manager"; description = "A simple text-based Minecraft modpack manager";
license = licenses.agpl3; license = licenses.agpl3;
homepage = src.meta.homepage; homepage = src.meta.homepage;
maintainers = with maintainers; [ foxit64 ]; maintainers = with maintainers; [ ];
}; };
} }

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

@ -36,14 +36,14 @@ let
}); });
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "phoc"; pname = "phoc";
version = "0.7.0"; version = "0.7.1";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "source.puri.sm"; domain = "source.puri.sm";
owner = "Librem5"; owner = "Librem5";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0afiyr2slg38ksrqn19zygsmjy9k5bpwv6n7zjas3s5djr6hch45"; sha256 = "0n188xa2pwl4258naxhz45cvipcid8y1zvlbddll9xydrrh9bwqn";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -18,9 +18,9 @@
} }
}, },
"beta": { "beta": {
"version": "92.0.4515.93", "version": "92.0.4515.101",
"sha256": "077i1rw84cgcmg2k0p1ycg5pwvnhgsa3qdfsr7icrn7gmagagqd0", "sha256": "1jcas265hhlqd9f63h4zw4n4xsl26c5zmjlmbf1px5icvcjfb2xd",
"sha256bin64": "1gf4qv8wvaagdgsinf2gprx9wcfgm8jql6870k50bi26mjqv9800", "sha256bin64": "0sb5l5nzfzisvrnhcfwhdh9rn6z6pkzqz4p92c40q2mlhmjrfhj0",
"deps": { "deps": {
"gn": { "gn": {
"version": "2021-05-07", "version": "2021-05-07",

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "cloudflared"; pname = "cloudflared";
version = "2021.6.0"; version = "2021.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudflare"; owner = "cloudflare";
repo = "cloudflared"; repo = "cloudflared";
rev = version; rev = version;
sha256 = "sha256-cX0kdBPDgwjHphxGWrnXohHPp1nzs4SnvCry4AxMtp0="; sha256 = "sha256-FQejuKBDUCCcEq9ZmSMigdvqowTurCYEhOiXQN7exIE=";
}; };
vendorSha256 = null; vendorSha256 = null;

View file

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

View file

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

View file

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

View file

@ -5,6 +5,7 @@
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence
, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu , mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu
, writeScript, common-updater-scripts
}: }:
let let
@ -71,7 +72,15 @@ in stdenv.mkDerivation rec {
mimeType = "x-scheme-handler/discord"; 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; { meta = with lib; {
description = "All-in-one cross-platform voice and text chat for gamers"; description = "All-in-one cross-platform voice and text chat for gamers";

View file

@ -27,10 +27,10 @@ in {
pname = "discord-canary"; pname = "discord-canary";
binaryName = "DiscordCanary"; binaryName = "DiscordCanary";
desktopName = "Discord Canary"; desktopName = "Discord Canary";
version = "0.0.125"; version = "0.0.126";
src = fetchurl { src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "0ly5a6l7rvl54mc39xma14jrcrf11q3ndnkkr16by5hy3palmz9g"; sha256 = "EraTDRKd6t0c9U68tSRdGkeB1hfqNS4KUewEXwkL8io=";
}; };
}; };
}.${branch} }.${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 , fetchFromGitLab
, pkg-config , pkg-config
, cmake , cmake
, qtquickcontrols2
, qtmultimedia
, qtgraphicaleffects
, qtkeychain
, libpulseaudio
, olm
, libsecret
, cmark , cmark
, extra-cmake-modules , extra-cmake-modules
, kconfig
, kdbusaddons
, ki18n
, kirigami2 , kirigami2
, kitemmodels , kitemmodels
, ki18n
, knotifications , knotifications
, kdbusaddons
, kconfig
, libquotient
, kquickimageedit , kquickimageedit
, libpulseaudio
, libquotient
, libsecret
, olm
, qqc2-desktop-style
, qtgraphicaleffects
, qtkeychain
, qtmultimedia
, qtquickcontrols2
}: }:
mkDerivation rec { mkDerivation rec {
pname = "neochat"; pname = "neochat";
version = "1.1.1"; version = "1.2";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "invent.kde.org"; domain = "invent.kde.org";
owner = "network"; owner = "network";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-HvLPsU+fxlyPDP7i9OSnZ/C1RjouOQCp+4WCl6FlFJo="; sha256 = "sha256-Kpv7BY/qS0A3xFlYFhz1RRNwQVsyhOTHHGDbWRTTv1I=";
}; };
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
buildInputs = [ buildInputs = [
qtkeychain
qtquickcontrols2
qtmultimedia
qtgraphicaleffects
olm
libsecret
cmark cmark
kconfig
kdbusaddons
ki18n
kirigami2 kirigami2
kitemmodels kitemmodels
ki18n
knotifications knotifications
kdbusaddons
kconfig
libquotient
kquickimageedit kquickimageedit
libpulseaudio libpulseaudio
libquotient
libsecret
olm
qtgraphicaleffects
qtkeychain
qtmultimedia
qtquickcontrols2
qqc2-desktop-style
]; ];
meta = with lib; { meta = with lib; {

View file

@ -1,14 +1,45 @@
{ lib, mkDerivation, fetchFromGitHub, cmake { lib
, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine , mkDerivation
, libidn, qca-qt5, libXScrnSaver, hunspell , fetchFromGitHub
, libsecret, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c , cmake
, qtbase
, qtmultimedia
, qtx11extras
, qttools
, libidn
, qca-qt5
, libXScrnSaver
, hunspell
, libsecret
, libgcrypt
, libotr
, html-tidy
, libgpgerror
, libsignal-protocol-c
, usrsctp , usrsctp
# Voice messages , chatType ? "basic" # See the assertion below for available options
, qtwebkit
, qtwebengine
, enablePlugins ? true
# Voice messages
, voiceMessagesSupport ? true , voiceMessagesSupport ? true
, gst_all_1 , gst_all_1
, enablePsiMedia ? false
, pkg-config
}: }:
assert builtins.elem (lib.toLower chatType) [
"basic" # Basic implementation, no web stuff involved
"webkit" # Legacy one, based on WebKit (see https://wiki.qt.io/Qt_WebKit)
"webengine" # QtWebEngine (see https://wiki.qt.io/QtWebEngine)
];
assert enablePsiMedia -> enablePlugins;
mkDerivation rec { mkDerivation rec {
pname = "psi-plus"; pname = "psi-plus";
version = "1.5.1549"; version = "1.5.1549";
@ -21,19 +52,40 @@ mkDerivation rec {
}; };
cmakeFlags = [ cmakeFlags = [
"-DENABLE_PLUGINS=ON" "-DCHAT_TYPE=${chatType}"
"-DENABLE_PLUGINS=${if enablePlugins then "ON" else "OFF"}"
"-DBUILD_PSIMEDIA=${if enablePsiMedia then "ON" else "OFF"}"
]; ];
nativeBuildInputs = [ cmake qttools ]; nativeBuildInputs = [
cmake
qttools
] ++ lib.optionals enablePsiMedia [
pkg-config
];
buildInputs = [ buildInputs = [
qtbase qtmultimedia qtx11extras qtwebengine qtbase
libidn qca-qt5 libXScrnSaver hunspell qtmultimedia
libsecret libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c qtx11extras
libidn
qca-qt5
libXScrnSaver
hunspell
libsecret
libgcrypt
libotr
html-tidy
libgpgerror
libsignal-protocol-c
usrsctp usrsctp
] ++ lib.optionals voiceMessagesSupport [ ] ++ lib.optionals voiceMessagesSupport [
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-good
] ++ lib.optionals (chatType == "webkit") [
qtwebkit
] ++ lib.optionals (chatType == "webengine") [
qtwebengine
]; ];
preFixup = lib.optionalString voiceMessagesSupport '' preFixup = lib.optionalString voiceMessagesSupport ''

View file

@ -28,7 +28,7 @@ let
else ""); else "");
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "signal-desktop"; pname = "signal-desktop";
version = "5.8.0"; # Please backport all updates to the stable channel. version = "5.9.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release. # All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is # When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with: # applied. The expiration date for the current release can be extracted with:
@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "0icwmlnnnlsj2g1p2q4lf7hlhys3rakaim7bah5qkmhwkrzkk30y"; sha256 = "1pmyi9b0b5h6mi6dwml41x4igy8rfpsv6j67izh78m5gla8wp34h";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -4,8 +4,8 @@ stdenv.mkDerivation {
name = "gappa-1.4.0"; name = "gappa-1.4.0";
src = fetchurl { src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.4.0.tar.gz"; url = "https://gforge.inria.fr/frs/download.php/file/38436/gappa-1.4.0.tar.gz";
sha256 = "sha256-/IDIf5XnFBqVllgH5GtQ6C8g7vxheaVcXNoZiXlsPGA="; sha256 = "12x42z901pr05ldmparqdi8sq9s7fxbavhzk2dbq3l6hy247dwbb";
}; };
buildInputs = [ gmp mpfr boost.dev ]; buildInputs = [ gmp mpfr boost.dev ];

View file

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

View file

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

View file

@ -8,10 +8,10 @@ let allVersions = with lib; flip map
# N.B. Versions in this list should be ordered from newest to oldest. # N.B. Versions in this list should be ordered from newest to oldest.
[ [
{ {
version = "12.3.0"; version = "12.3.1";
lang = "en"; lang = "en";
language = "English"; language = "English";
sha256 = "045df045f6e796ded59f64eb2e0f1949ac88dcba1d5b6e05fb53ea0a4aed7215"; sha256 = "51b9cab12fd91b009ea7ad4968a2c8a59e94dc55d2e6cc1d712acd5ba2c4d509";
} }
{ {
version = "11.3.0"; version = "11.3.0";

View file

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

View file

@ -1,23 +1,73 @@
{ stdenv, lib, fetchurl, makeWrapper, cmake, git, ftgl, gl2ps, glew, gsl { stdenv
, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, xz, pcre, nlohmann_json , lib
, pkg-config, python, xxHash, zlib, zstd , fetchurl
, libAfterImage, giflib, libjpeg, libtiff, libpng , makeWrapper
, Cocoa, CoreSymbolication, OpenGL, noSplash ? false }: , 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 { stdenv.mkDerivation rec {
pname = "root"; pname = "root";
version = "6.24.00"; version = "6.24.02";
src = fetchurl { src = fetchurl {
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
sha256 = "12crjzd7pzx5qpk2pb3z0rhmxlw5gsqaqzfl48qiq8c9l940b8wx"; sha256 = "sha256-BQfhCV4nnMxyQPZR0llmAkMlF5+oWhJZtpS1ZyOtfBw=";
}; };
nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; 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 ] buildInputs = [
++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ftgl
++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ] 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 = [ patches = [
./sw_vers.patch ./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 { stdenv.mkDerivation rec {
pname = "git-sync"; pname = "git-sync";
version = "20151024"; version = "unstable-2021-07-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "simonthum"; owner = "simonthum";
repo = "git-sync"; repo = "git-sync";
rev = "eb9adaf2b5fd65aac1e83d6544b9076aae6af5b7"; rev = "7d3d34bf3ee2483fba00948f5b97f964b849a590";
sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz"; sha256 = "sha256-PuYREW5NBkYF1tlcLTbOI8570nvHn5ifN8OIInfNNxI=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
@ -18,10 +17,11 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp -a git-sync $out/bin/git-sync cp -a git-* $out/bin/
''; '';
wrapperPath = with lib; makeBinPath [ wrapperPath = with lib; makeBinPath [
inotify-tools
coreutils coreutils
git git
gnugrep gnugrep

View file

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

View file

@ -8,7 +8,7 @@ rec {
, moby-src , moby-src
, runcRev, runcSha256 , runcRev, runcSha256
, containerdRev, containerdSha256 , containerdRev, containerdSha256
, tiniRev, tiniSha256, buildxSupport ? false , tiniRev, tiniSha256, buildxSupport ? true
# package dependencies # package dependencies
, stdenv, fetchFromGitHub, buildGoPackage , stdenv, fetchFromGitHub, buildGoPackage
, makeWrapper, installShellFiles, pkg-config, glibc , makeWrapper, installShellFiles, pkg-config, glibc
@ -77,6 +77,10 @@ rec {
extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]); extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]);
postPatch = ''
patchShebangs hack/make.sh hack/make/
'';
buildPhase = '' buildPhase = ''
export GOCACHE="$TMPDIR/go-cache" export GOCACHE="$TMPDIR/go-cache"
# build engine # build engine
@ -88,11 +92,6 @@ rec {
cd - cd -
''; '';
postPatch = ''
patchShebangs .
substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd
'';
installPhase = '' installPhase = ''
cd ./go/src/${goPackagePath} cd ./go/src/${goPackagePath}
install -Dm755 ./bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd install -Dm755 ./bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd
@ -144,6 +143,14 @@ rec {
sqlite lvm2 btrfs-progs systemd libseccomp sqlite lvm2 btrfs-progs systemd libseccomp
] ++ optionals (buildxSupport) [ docker-buildx ]; ] ++ optionals (buildxSupport) [ docker-buildx ];
postPatch = ''
patchShebangs man scripts/build/
substituteInPlace ./scripts/build/.variables --replace "set -eu" ""
'' + optionalString buildxSupport ''
substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \
${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]}
'';
# Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables # Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables
buildPhase = '' buildPhase = ''
export GOCACHE="$TMPDIR/go-cache" export GOCACHE="$TMPDIR/go-cache"
@ -162,14 +169,6 @@ rec {
cd - cd -
''; '';
postPatch = ''
patchShebangs .
substituteInPlace ./scripts/build/.variables --replace "set -eu" ""
'' + optionalString buildxSupport ''
substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \
${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]}
'';
outputs = ["out" "man"]; outputs = ["out" "man"];
installPhase = '' installPhase = ''
@ -211,7 +210,7 @@ rec {
homepage = "https://www.docker.com/"; homepage = "https://www.docker.com/";
description = "An open source project to pack, ship and run any application as a lightweight container"; description = "An open source project to pack, ship and run any application as a lightweight container";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ offline tailhook vdemeester periklis ]; maintainers = with maintainers; [ offline tailhook vdemeester periklis mikroskeem ];
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;
}; };
@ -222,14 +221,14 @@ rec {
# Get revisions from # Get revisions from
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
docker_20_10 = callPackage dockerGen rec { docker_20_10 = callPackage dockerGen rec {
version = "20.10.6"; version = "20.10.7";
rev = "v${version}"; rev = "v${version}";
sha256 = "15kknb26vyzjgqmn8r81a1sy1i5br6bvngqd5xljihppnxvp2gvl"; sha256 = "1r854jrjph4v1n5lr82z0cl0241ycili4qr3qh3k3bmqx790cds3";
moby-src = fetchFromGitHub { moby-src = fetchFromGitHub {
owner = "moby"; owner = "moby";
repo = "moby"; repo = "moby";
rev = "v${version}"; rev = "v${version}";
sha256 = "1l4ra9bsvydaxd2fy7dgxp7ynpp0mrlwvcdhxiafw596559ab6qk"; sha256 = "0xhn11kgcbzda4z9j0rflvq0nfivizh3jrzhanwn5vnghafy4zqw";
}; };
runcRev = "b9ee9c6314599f1b4a7f497e1f1f856fe433d3b7"; # v1.0.0-rc95 runcRev = "b9ee9c6314599f1b4a7f497e1f1f856fe433d3b7"; # v1.0.0-rc95
runcSha256 = "18sbvmlvb6kird4w3rqsfrjdj7n25firabvdxsl0rxjfy9r1g2xb"; runcSha256 = "18sbvmlvb6kird4w3rqsfrjdj7n25firabvdxsl0rxjfy9r1g2xb";

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, pkg-config { lib, stdenv, fetchurl, pkg-config
, libjpeg, libtiff, libpng, freetype , libtiff
, fltk, gtk , fltk, gtk
, libX11, libXext, libICE , libICE, libSM
, dbus , dbus
, fetchpatch , 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 ]; 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 # A strange type of bug: dbus is not immediately found by pkg-config
preConfigure = '' preConfigure = ''

View file

@ -37,14 +37,14 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "phosh"; pname = "phosh";
version = "0.11.0"; version = "0.12.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "source.puri.sm"; domain = "source.puri.sm";
owner = "Librem5"; owner = "Librem5";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "104qib4blh32s7bg6j3xza3s9syrxrvyh2wpyh5yx7v5wqarr20x"; sha256 = "1s0lgq04qz562iri535wpwvfkmmngdpclyl329cf7rc9ihy1kjvs";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -0,0 +1,39 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "kanit";
version = "unstable-2020-06-16";
src = fetchFromGitHub {
owner = "cadsondemak";
repo = pname;
rev = "467dfe842185681d8042cd608b8291199dd37cda";
sha256 = "0p0klb0376r8ki4ap2j99j7jcsq6wgb7m1hf3j1dkncwm7ikmg3h";
};
installPhase = ''
mkdir -p $out/share/doc/${pname}/css/ $out/share/fonts/{opentype,truetype}
cp $src/OFL.txt $src/documentation/{BRIEF.md,features.html} $out/share/doc/${pname}
cp $src/documentation/css/fonts.css $out/share/doc/${pname}/css
cp $src/fonts/otf/*.otf $out/share/fonts/opentype
cp $src/fonts/ttf/*.ttf $out/share/fonts/truetype
'';
meta = with lib; {
homepage = "https://cadsondemak.github.io/kanit/";
description = "A loopless Thai and sans serif Latin typeface for contemporary and futuristic uses";
longDescription = ''
Kanit means mathematics in Thai, and the Kanit typeface family is a formal
Loopless Thai and Sans Latin design. It is a combination of concepts,
mixing a Humanist Sans Serif motif with the curves of Capsulated Geometric
styles that makes it suitable for various uses, contemporary and
futuristic. A notable detail is that the stroke terminals have flat angles,
which allows the design to enjoy decreased spacing between letters while
preserving readability and legibility at smaller point sizes.
'';
license = licenses.ofl;
platforms = platforms.all;
maintainers = [ maintainers.toastal ];
};
}

View file

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

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dqlite"; pname = "dqlite";
version = "1.7.0"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "canonical"; owner = "canonical";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-lCMTmKnDv/fb5fP/Ch8AwpuNfmR+gecxeIweO6hHj5U="; sha256 = "0ghvwlgj5574kpgc53bfhqp4437xxvr05061wwxplpjxn37hy26d";
}; };
nativeBuildInputs = [ autoreconfHook file pkg-config ]; nativeBuildInputs = [ autoreconfHook file pkg-config ];

View file

@ -1,52 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi import ./common.nix rec {
, freeglut, libGLU, libGL, libjpeg, zlib, libXft, libpng version = "1.4.x-2021-07-04";
, libtiff, freetype, Cocoa, AGL, GLUT rev = "1008cdfab27609a6f6a0e82dadad9fd9cbd8a66d";
}: sha256 = "1h057dyhd04b9bjci952b2l7brxv183l9jw9i50mn9qjfljmvqim";
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;
};
} }

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 import ./common.nix rec {
, freeglut, libGL, libGLU, libjpeg, zlib, libXft, libpng version = "1.3.6";
, libtiff, freetype, Cocoa, AGL, GLUT rev = "release-${version}";
}: sha256 = "0vzk4d6j927v7dxywr5xlqlf70myal1xikkdfvd11p94rcdf9bsv";
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;
};
} }

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" ]; 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 ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];

View file

@ -0,0 +1,36 @@
{ lib, fetchFromGitLab, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "tezos-rust-libs";
version = "1.0";
src = fetchFromGitLab {
owner = "tezos";
repo = "tezos-rust-libs";
rev = "v${version}";
sha256 = "1ffkzbvb0ls4wk9205g3xh2c26cmwnl68x43gh6dm9z4xsic94v5";
};
cargoSha256 = "0dgyqfr3dvvdwdi1wvpd7v9j21740jy4zwrwiwknw7csb4bq9wfx";
preBuild = ''
mkdir .cargo
mv cargo-config .cargo/config
'';
postInstall = ''
mkdir $out/lib/tezos-rust-libs
cp -r rustc-bls12-381/include $out/include
cp $out/lib/librustc_bls12_381.a $out/lib/tezos-rust-libs
cp $out/lib/librustzcash.a $out/lib/tezos-rust-libs
'';
doCheck = true;
meta = {
homepage = "https://gitlab.com/tezos/tezos-rust-libs";
description = "Tezos: all rust dependencies and their dependencies";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.ulrikstrid ];
};
}

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 { coc-imselect = super.coc-imselect.override {
meta.broken = since "10"; meta.broken = since "10";
}; };
@ -107,6 +125,19 @@ let
nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package self.pulp ]; nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package self.pulp ];
}); });
jsonplaceholder = super.jsonplaceholder.override (drv: {
buildInputs = [ nodejs ];
postInstall = ''
exe=$out/bin/jsonplaceholder
mkdir -p $out/bin
cat >$exe <<EOF
#!${pkgs.runtimeShell}
exec -a jsonplaceholder ${nodejs}/bin/node $out/lib/node_modules/jsonplaceholder/index.js
EOF
chmod a+x $exe
'';
});
makam = super.makam.override { makam = super.makam.override {
buildInputs = [ pkgs.nodejs pkgs.makeWrapper ]; buildInputs = [ pkgs.nodejs pkgs.makeWrapper ];
postFixup = '' postFixup = ''
@ -277,7 +308,7 @@ let
}; };
teck-programmer = super.teck-programmer.override { teck-programmer = super.teck-programmer.override {
buildInputs = [ pkgs.libusb ]; buildInputs = [ pkgs.libusb1 ];
}; };
vega-cli = super.vega-cli.override { vega-cli = super.vega-cli.override {

View file

@ -3,6 +3,7 @@
, "@antora/cli" , "@antora/cli"
, "@antora/site-generator-default" , "@antora/site-generator-default"
, "@bitwarden/cli" , "@bitwarden/cli"
, "@hyperspace/cli"
, "@nestjs/cli" , "@nestjs/cli"
, "@vue/cli" , "@vue/cli"
, "@webassemblyjs/cli" , "@webassemblyjs/cli"
@ -139,6 +140,7 @@
, "json-refs" , "json-refs"
, "json-server" , "json-server"
, "jsonlint" , "jsonlint"
, "jsonplaceholder"
, "kaput-cli" , "kaput-cli"
, "katex" , "katex"
, "karma" , "karma"

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,38 @@
{ lib, fetchFromGitLab, buildDunePackage, ff, zarith, ctypes, tezos-rust-libs, alcotest }:
buildDunePackage rec {
pname = "bls12-381";
version = "0.3.15";
src = fetchFromGitLab {
owner = "dannywillems";
repo = "ocaml-bls12-381";
rev = version;
sha256 = "1s8n657fsl2gs01p7v2ffpcfzymavifhhpriyx1gq5qh4zvvw4vr";
};
useDune2 = true;
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [
ff
zarith
ctypes
tezos-rust-libs
];
checkInputs = [
alcotest
];
# This is a hack to work around the hack used in the dune files
OPAM_SWITCH_PREFIX = "${tezos-rust-libs}";
doCheck = true;
meta = {
homepage = "https://gitlab.com/dannywillems/ocaml-bls12-381";
description = "OCaml binding for bls12-381 from librustzcash";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.ulrikstrid ];
};
}

View file

@ -0,0 +1,32 @@
{ lib, fetchFromGitLab, buildDunePackage, zarith, alcotest }:
buildDunePackage rec {
pname = "ff";
version = "0.4.0";
src = fetchFromGitLab {
owner = "dannywillems";
repo = "ocaml-ff";
rev = version;
sha256 = "1ik29srzkd0pl48p1si9p1c4f8vmx5rgm02yv2arj3vg0a1nfhdv";
};
useDune2 = true;
propagatedBuildInputs = [
zarith
];
checkInputs = [
alcotest
];
doCheck = true;
meta = {
homepage = "https://gitlab.com/dannywillems/ocaml-ff";
description = "OCaml implementation of Finite Field operations";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.ulrikstrid ];
};
}

View file

@ -1,16 +1,16 @@
{ lib, fetchurl, buildDunePackage { lib, fetchurl, buildDunePackage
, repr, ppx_repr, fmt, logs, mtime, stdlib-shims , repr, ppx_repr, fmt, logs, mtime, stdlib-shims
, cmdliner, progress, semaphore-compat , cmdliner, progress, semaphore-compat, optint
, alcotest, crowbar, re , alcotest, crowbar, re
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "index"; pname = "index";
version = "1.3.1"; version = "1.4.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz";
sha256 = "sha256-ycZi/TFLoGRloSpjYqH5FCHWP3eyiTCIDLESEn5inuI="; sha256 = "13xd858c50fs651p1y8x70323ff0gzbf6zgc0a25f6xh3rsmkn4c";
}; };
minimumOCamlVersion = "4.08"; minimumOCamlVersion = "4.08";
@ -28,6 +28,7 @@ buildDunePackage rec {
progress progress
repr repr
semaphore-compat semaphore-compat
optint
]; ];
checkInputs = [ checkInputs = [

View file

@ -1,5 +1,5 @@
{ lib, buildDunePackage { lib, buildDunePackage
, alcotest-lwt, index, irmin, irmin-layers, irmin-test, ocaml_lwt, fpath , alcotest-lwt, index, irmin, irmin-layers, irmin-test, ocaml_lwt, fpath, optint
}: }:
buildDunePackage rec { buildDunePackage rec {
@ -12,7 +12,7 @@ buildDunePackage rec {
useDune2 = true; useDune2 = true;
buildInputs = [ fpath ]; buildInputs = [ fpath ];
propagatedBuildInputs = [ index irmin irmin-layers ocaml_lwt ]; propagatedBuildInputs = [ index irmin irmin-layers ocaml_lwt optint ];
checkInputs = [ alcotest-lwt irmin-test ]; checkInputs = [ alcotest-lwt irmin-test ];

View file

@ -2,11 +2,11 @@
buildDunePackage rec { buildDunePackage rec {
pname = "ppx_irmin"; pname = "ppx_irmin";
version = "2.6.0"; version = "2.7.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz";
sha256 = "1db134221e82c424260a0e206b640fcb82902be35eea4137af2bcd9c98d3ac0f"; sha256 = "fac7c032f472fb369378ad2d8fe77e7cd3b3c1c6a0d7bf59980b69528891b399";
}; };
minimumOCamlVersion = "4.08"; minimumOCamlVersion = "4.08";

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,11 +2,11 @@
buildDunePackage rec { buildDunePackage rec {
pname = "repr"; pname = "repr";
version = "0.3.0"; version = "0.4.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-fuzz-${version}.tbz"; url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-fuzz-${version}.tbz";
sha256 = "sha256-2b0v5RwutvyidzEDTEb5p33IvJ+3t2IW+KVxYD1ufXQ="; sha256 = "1kpwgncyxcrq90dn7ilja7c5i88whc3fz4fmq1lwr0ar95d7d48p";
}; };
minimumOCamlVersion = "4.08"; minimumOCamlVersion = "4.08";

View file

@ -1,4 +1,4 @@
{ buildDunePackage, ppx_deriving, ppxlib, repr, alcotest, hex }: { lib, buildDunePackage, ppx_deriving, ppxlib, repr, alcotest, hex }:
buildDunePackage { buildDunePackage {
pname = "ppx_repr"; pname = "ppx_repr";

View file

@ -0,0 +1,13 @@
{ lib, buildDunePackage, resto, uri }:
buildDunePackage {
pname = "resto-acl";
inherit (resto) src version meta useDune2 doCheck;
minimalOCamlVersion = "4.05";
propagatedBuildInputs = [
resto
uri
];
}

View file

@ -0,0 +1,20 @@
{ buildDunePackage
, resto
, resto-directory
, resto-cohttp
, uri
, lwt
}:
buildDunePackage {
pname = "resto-cohttp-client";
inherit (resto) src version meta useDune2 doCheck;
propagatedBuildInputs = [
resto
resto-directory
resto-cohttp
uri
lwt
];
}

View file

@ -0,0 +1,27 @@
{ lib
, buildDunePackage
, resto
, resto-directory
, resto-acl
, resto-cohttp
, resto-cohttp-client
, resto-cohttp-server
, uri
, lwt
}:
buildDunePackage {
pname = "resto-cohttp-self-serving-client";
inherit (resto) src version meta useDune2 doCheck;
propagatedBuildInputs = [
resto
resto-directory
resto-acl
resto-cohttp
resto-cohttp-client
resto-cohttp-server
uri
lwt
];
}

View file

@ -0,0 +1,25 @@
{ lib
, buildDunePackage
, resto
, resto-directory
, resto-acl
, resto-cohttp
, cohttp-lwt-unix
, conduit-lwt-unix
, lwt
}:
buildDunePackage {
pname = "resto-cohttp-server";
inherit (resto) src version meta useDune2 doCheck;
propagatedBuildInputs = [
resto
resto-directory
resto-acl
resto-cohttp
cohttp-lwt-unix
conduit-lwt-unix
lwt
];
}

View file

@ -0,0 +1,12 @@
{ buildDunePackage, resto, resto-directory, cohttp-lwt }:
buildDunePackage {
pname = "resto-cohttp";
inherit (resto) src version meta useDune2 doCheck;
propagatedBuildInputs = [
resto
resto-directory
cohttp-lwt
];
}

View file

@ -0,0 +1,28 @@
{ lib, fetchFromGitLab, buildDunePackage, uri }:
buildDunePackage rec {
pname = "resto";
version = "0.6.1";
src = fetchFromGitLab {
owner = "nomadic-labs";
repo = "resto";
rev = "v${version}";
sha256 = "13h3zga7h2jhgbyda1q53szbpxcz3vvy3c51mlqk3jh9jq2wrn87";
};
useDune2 = true;
propagatedBuildInputs = [
uri
];
# resto has infinite recursion in their tests
doCheck = false;
meta = {
description = "A minimal OCaml library for type-safe HTTP/JSON RPCs";
homepage = "https://gitlab.com/nomadic-labs/resto";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.ulrikstrid ];
};
}

View file

@ -0,0 +1,11 @@
{ lib, buildDunePackage, resto, resto-json, lwt }:
buildDunePackage {
pname = "resto-directory";
inherit (resto) src version meta useDune2 doCheck;
propagatedBuildInputs = [
resto
lwt
];
}

View file

@ -0,0 +1,13 @@
{ buildDunePackage, resto, resto-directory, ezresto, lwt }:
buildDunePackage {
pname = "ezresto-directory";
inherit (resto) src version meta useDune2 doCheck;
propagatedBuildInputs = [
ezresto
resto-directory
resto
lwt
];
}

View file

@ -0,0 +1,12 @@
{ lib, buildDunePackage, resto, resto-json, uri }:
buildDunePackage {
pname = "ezresto";
inherit (resto) src version meta useDune2 doCheck;
propagatedBuildInputs = [
uri
resto
resto-json
];
}

View file

@ -0,0 +1,12 @@
{ lib, buildDunePackage, resto, json-data-encoding, json-data-encoding-bson }:
buildDunePackage {
pname = "resto-json";
inherit (resto) src version meta useDune2 doCheck;
propagatedBuildInputs = [
resto
json-data-encoding
json-data-encoding-bson
];
}

View file

@ -7,14 +7,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ailment"; pname = "ailment";
version = "9.0.8761"; version = "9.0.9031";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-UAtVWh3BBZZmU5+BR0+2B+rivzR4E7bZK1ro1uKngtE="; sha256 = "sha256-xyNTcGTGH8030CJif6an+kDZIfOUVDMiRhFamVajAzk=";
}; };
propagatedBuildInputs = [ pyvex ]; propagatedBuildInputs = [ pyvex ];

View file

@ -13,6 +13,7 @@
, GitPython , GitPython
, itanium_demangler , itanium_demangler
, mulpyplexer , mulpyplexer
, nampa
, networkx , networkx
, progressbar2 , progressbar2
, protobuf , protobuf
@ -42,14 +43,14 @@ in
buildPythonPackage rec { buildPythonPackage rec {
pname = "angr"; pname = "angr";
version = "9.0.8761"; version = "9.0.9031";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-vPqCezHYJP3ue3/J/Pni9jPvSJ+om7nAVgPTU6z5xBE="; sha256 = "sha256-qWAz9SHfQU0cdk4yVekJn5OIDPJPbi63CDdlHDq1Opw=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -65,6 +66,7 @@ buildPythonPackage rec {
GitPython GitPython
itanium_demangler itanium_demangler
mulpyplexer mulpyplexer
nampa
networkx networkx
progressbar2 progressbar2
protobuf protobuf
@ -83,7 +85,13 @@ buildPythonPackage rec {
doCheck = false; doCheck = false;
# See http://angr.io/api-doc/ # See http://angr.io/api-doc/
pythonImportsCheck = [ "angr" "claripy" "cle" "pyvex" "archinfo" ]; pythonImportsCheck = [
"angr"
"claripy"
"cle"
"pyvex"
"archinfo"
];
meta = with lib; { meta = with lib; {
description = "Powerful and user-friendly binary analysis platform"; description = "Powerful and user-friendly binary analysis platform";

View file

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "angrop"; pname = "angrop";
version = "9.0.8761"; version = "9.0.9031";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-M/4kEESL9OH4KyPgsrlVzm54OtU28pDox5qtV7Up2ew="; sha256 = "sha256-3q/3iFR0FFOcvgmNVXtgi1Spu5xfXNJFy+QoIh8amOY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -7,13 +7,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "archinfo"; pname = "archinfo";
version = "9.0.8761"; version = "9.0.9031";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-mdry5JQIW1b2p9a+c6RfHE6HYs54WKFofPkzFCgpUXg="; sha256 = "sha256-pzBMyw5FwQV1FyhvOxUq39s96p0KKSrkEvJzhJQdS4E=";
}; };
checkInputs = [ checkInputs = [

View file

@ -10,11 +10,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aws-sam-translator"; pname = "aws-sam-translator";
version = "1.36.0"; version = "1.37.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "fa1b990d9329d19052e7b91cf0b19371ed9d31a529054b616005884cd662b584"; sha256 = "0p2qd8gwxsfq17nmrlkpf31aqbfzjrwjk3n4p8vhci8mm11dk138";
}; };
# Tests are not included in the PyPI package # Tests are not included in the PyPI package

View file

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "claripy"; pname = "claripy";
version = "9.0.8761"; version = "9.0.9031";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-MEG6J7FBjufFqvmfV+LTtgDJb8eZuUrDq4am/mnYCZI="; sha256 = "sha256-UCmt2Vm8OWyKa0fmPlGuvzaFddUWs6quavUgIZasoJg=";
}; };
# Use upstream z3 implementation # Use upstream z3 implementation

View file

@ -15,7 +15,7 @@
let let
# The binaries are following the argr projects release cycle # The binaries are following the argr projects release cycle
version = "9.0.8761"; version = "9.0.9031";
# Binary files from https://github.com/angr/binaries (only used for testing and only here) # Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub { binaries = fetchFromGitHub {
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-cJpwtAX2cck/SoTfm8G93Imyyqn1B2Izkxk9O7WtRrk="; sha256 = "sha256-+9aW7J8FXuKtU20dpqnoj37McPxzbkjKuYZIO8QeFF0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

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

View file

@ -1,37 +1,47 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchFromGitHub
, isPy27 , isPy27
, nose , pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "dill"; pname = "dill";
version = "0.3.1.1"; version = "0.3.4";
doCheck = !isPy27;
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "uqfoundation";
sha256 = "42d8ef819367516592a825746a18073ced42ca169ab1f5f4044134703e7a049c"; repo = pname;
rev = "${pname}-${version}";
sha256 = "0x702gh50wb3n820p2p9w49cn4a354y207pllwc7snfxprv6hypm";
}; };
# python2 can't import a test fixture checkInputs = [
doCheck = !isPy27; pytestCheckHook
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"
'';
# Tests seem to fail because of import pathing and referencing items/classes in modules. # 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. # 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)"; description = "Serialize all of python (almost)";
homepage = "https://github.com/uqfoundation/dill/"; homepage = "https://github.com/uqfoundation/dill/";
license = lib.licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ ];
}; };
} }

View file

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

View file

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

View file

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, future
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "nampa";
version = "1.0";
src = fetchFromGitHub {
owner = "thebabush";
repo = pname;
rev = version;
sha256 = "14b6xjm497wrfw4kv24zhsvz2l6zknvx36w8i754hfwz3s3fsl6a";
};
propagatedBuildInputs = [
future
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
# https://github.com/thebabush/nampa/pull/13
substituteInPlace setup.py \
--replace "0.1.1" "${version}"
'';
pythonImportsCheck = [ "nampa" ];
meta = with lib; {
description = "Python implementation of the FLIRT technology";
homepage = "https://github.com/thebabush/nampa";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -1,8 +1,15 @@
{ buildPythonPackage, isPy3k, lib, fetchFromGitHub, setuptools-scm, toml, pytest }: { lib
, buildPythonPackage
, isPy3k
, fetchFromGitHub
, setuptools-scm
, toml
, pytestCheckHook
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pure_eval"; pname = "pure_eval";
version = "0.1.0"; version = "0.2.1";
disabled = !isPy3k; disabled = !isPy3k;
@ -10,15 +17,24 @@ buildPythonPackage rec {
owner = "alexmojaki"; owner = "alexmojaki";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1d3gpc9mrmwdk6l87x7ll23vwv6l8l2iqvi63r86j7bj5s8m2ci8"; sha256 = "sha256-+Vucu16NFPtQ23AbBH/cQU+klxp6DMicSScbnKegLZI=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version; SETUPTOOLS_SCM_PRETEND_VERSION = version;
buildInputs = [ setuptools-scm ]; buildInputs = [
propagatedBuildInputs = [ toml ]; setuptools-scm
];
checkInputs = [ pytest ]; propagatedBuildInputs = [
toml
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "pure_eval" ];
meta = with lib; { meta = with lib; {
description = "Safely evaluate AST nodes without side effects"; description = "Safely evaluate AST nodes without side effects";

View file

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

View file

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

View file

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

View file

@ -1,38 +1,39 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
# Runtime inputs:
, pyparsing
# Check inputs:
, pytest
, mock , mock
, pyparsing
, pytestCheckHook
, python-dateutil
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyhocon"; pname = "pyhocon";
version = "0.3.53"; version = "0.3.58";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chimpler"; owner = "chimpler";
repo = "pyhocon"; repo = "pyhocon";
rev = version; 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. pythonImportsCheck = [ "pyhocon" ];
# See https://github.com/chimpler/pyhocon/pull/203
doCheck = false;
meta = with lib; { meta = with lib; {
homepage = "https://github.com/chimpler/pyhocon/"; homepage = "https://github.com/chimpler/pyhocon/";
description = "HOCON parser for Python"; description = "HOCON parser for Python";
# Long description copied from # taken from https://pypi.org/project/pyhocon/
# https://github.com/chimpler/pyhocon/blob/55a9ea3ebeeac5764bdebebfbeacbf099f64db26/setup.py
# (the tip of master as of 2019-03-24).
longDescription = '' longDescription = ''
A HOCON parser for Python. It additionally provides a tool A HOCON parser for Python. It additionally provides a tool
(pyhocon) to convert any HOCON content into json, yaml and properties (pyhocon) to convert any HOCON content into json, yaml and properties

View file

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

View file

@ -11,11 +11,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyvex"; pname = "pyvex";
version = "9.0.8761"; version = "9.0.9031";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-3aLpMiOJfgELfnpqTyXAL6Uofbm4UW4VRRsYzTTAofg="; sha256 = "sha256-bl6bWv4c+tlaWcxrYCiljC9C+wAZZVyk+1O0rlb4kxA=";
}; };
postPatch = lib.optionalString stdenv.isDarwin '' postPatch = lib.optionalString stdenv.isDarwin ''

View file

@ -14,14 +14,14 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "stack_data"; pname = "stack-data";
version = "0.0.7"; version = "0.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alexmojaki"; owner = "alexmojaki";
repo = pname; repo = "stack_data";
rev = "v${version}"; rev = "v${version}";
sha256 = "148lhxihak8jm5dvryhsiykmn3s4mrlba8ki4dy1nbd8jnz06a4w"; sha256 = "sha256-dRIRDMq0tc1QuBHvppPwJA5PVGHyVRhoBlX5BsdDzec=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version; SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -45,6 +45,14 @@ buildPythonPackage rec {
typeguard typeguard
]; ];
disabledTests = [
# AssertionError
"test_variables"
"test_example"
];
pythonImportsCheck = [ "stack_data" ];
meta = with lib; { meta = with lib; {
description = "Extract data from stack frames and tracebacks"; description = "Extract data from stack frames and tracebacks";
homepage = "https://github.com/alexmojaki/stack_data/"; homepage = "https://github.com/alexmojaki/stack_data/";

View file

@ -5,11 +5,11 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "aws-sam-cli"; pname = "aws-sam-cli";
version = "1.23.0"; version = "1.26.0";
src = python3.pkgs.fetchPypi { src = python3.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0j0q6p08c3l9z0yc2cggw797k47cjh6ljpchiqgg0fh6mk32215f"; sha256 = "11aqdwhs7wa6cp9zijqi4in3zvwirfnlcy45rrnsq0jdsh3i9hbh";
}; };
# Tests are not included in the PyPI package # Tests are not included in the PyPI package
@ -40,6 +40,8 @@ python3.pkgs.buildPythonApplication rec {
# fix over-restrictive version bounds # fix over-restrictive version bounds
postPatch = '' postPatch = ''
substituteInPlace requirements/base.txt \ substituteInPlace requirements/base.txt \
--replace "click~=7.1" "click~=8.0" \
--replace "Flask~=1.1.2" "Flask~=2.0" \
--replace "dateparser~=0.7" "dateparser>=0.7" \ --replace "dateparser~=0.7" "dateparser>=0.7" \
--replace "docker~=4.2.0" "docker>=4.2.0" \ --replace "docker~=4.2.0" "docker>=4.2.0" \
--replace "requests==2.23.0" "requests~=2.24" \ --replace "requests==2.23.0" "requests~=2.24" \

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

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "reviewdog"; pname = "reviewdog";
version = "0.11.0"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0n7hk3va25ym8sb900i1s1hjszgwrfl7gfsjbj1m330fidh3q6jc"; sha256 = "18fk4xzl6ys3azyw9ap14zgf3av5fdsrdn4mxx9calimvzbl4nfp";
}; };
vendorSha256 = "0xscirzi0gqww33ngwh29jiylarj0w5snn9kvv43wfrphb6c79s5"; vendorSha256 = "1qcp8v426500cpfrchazsh5rw4nr0c31vmrhbfgb9js4vxrn8acr";
doCheck = false; doCheck = false;
@ -22,7 +22,7 @@ buildGoModule rec {
meta = with lib; { meta = with lib; {
description = "Automated code review tool integrated with any code analysis tools regardless of programming language"; description = "Automated code review tool integrated with any code analysis tools regardless of programming language";
homepage = "https://github.com/reviewdog/reviewdog"; homepage = "https://github.com/reviewdog/reviewdog";
changelog = "https://github.com/reviewdog/reviewdog/releases/tag/v${version}"; changelog = "https://github.com/reviewdog/reviewdog/raw/v${version}/CHANGELOG.md";
maintainers = [ maintainers.marsam ]; maintainers = [ maintainers.marsam ];
license = licenses.mit; license = licenses.mit;
}; };

View file

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

Some files were not shown because too many files have changed in this diff Show more