Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-05-13 00:56:26 +00:00 committed by GitHub
commit a8e5ac148b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 438 additions and 149 deletions

View file

@ -1322,6 +1322,12 @@
github = "bmilanov";
githubId = 30090366;
};
bmwalters = {
name = "Bradley Walters";
email = "oss@walters.app";
github = "bmwalters";
githubId = 4380777;
};
bobakker = {
email = "bobakk3r@gmail.com";
github = "bobakker";

View file

@ -7,7 +7,7 @@
, xdg-utils, yasm, nasm, minizip, libwebp
, libusb1, pciutils, nss, re2
, python2Packages, python3Packages, perl, pkg-config
, python2, python3, perl, pkg-config
, nspr, systemd, libkrb5
, util-linux, alsaLib
, bison, gperf
@ -43,16 +43,12 @@ with lib;
let
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
# TODO: Python 3 support is incomplete and "python3 ../../build/util/python2_action.py"
# currently doesn't work due to mixed Python 2/3 dependencies:
pythonPackages = if chromiumVersionAtLeast "93"
then python3Packages
else python2Packages;
forcePython3Patch = (githubPatch
# Reland #8 of "Force Python 3 to be used in build."":
"a2d3c362802d9e6b62f895fcda75a3695b77b1b8"
"1r9spr2wmjk9x9l3m1gzn6692mlvbxdz0r5hlr5rfwiwr900rxi2"
);
python2WithPackages = python2.withPackages(ps: with ps; [
ply jinja2 setuptools
]);
python3WithPackages = python3.withPackages(ps: with ps; [
ply jinja2 setuptools
]);
# The additional attributes for creating derivations based on the chromium
# source tree.
@ -138,10 +134,12 @@ let
};
nativeBuildInputs = [
ninja pkg-config
python2WithPackages perl nodejs
gnutar which
llvmPackages.lldClang.bintools
ninja which pythonPackages.python perl pkg-config
pythonPackages.ply pythonPackages.jinja2 nodejs
gnutar pythonPackages.setuptools
] ++ lib.optionals (chromiumVersionAtLeast "92") [
python3WithPackages
];
buildInputs = defaultDependencies ++ [
@ -174,8 +172,6 @@ let
postPatch = lib.optionalString (chromiumVersionAtLeast "91") ''
# Required for patchShebangs (unsupported):
chmod -x third_party/webgpu-cts/src/tools/deno
'' + optionalString (chromiumVersionAtLeast "92") ''
patch -p1 --reverse < ${forcePython3Patch}
'' + ''
# remove unused third-party
for lib in ${toString gnSystemLibraries}; do
@ -313,7 +309,7 @@ let
# This is to ensure expansion of $out.
libExecPath="${libExecPath}"
python build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries}
${python2}/bin/python2 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries}
${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt
# Fail if `gn gen` contains a WARNING.

View file

@ -35,6 +35,8 @@ let
fetchMixDeps = callPackage ./fetch-mix-deps.nix { };
mixRelease = callPackage ./mix-release.nix { };
erlang-ls = callPackage ./erlang-ls { };
# BEAM-based languages.
elixir = elixir_1_11;

View file

@ -0,0 +1,34 @@
{ fetchFromGitHub, fetchHex, stdenv, rebar3WithPlugins, lib }:
let
version = "0.15.0";
owner = "erlang-ls";
repo = "erlang_ls";
deps = import ./rebar-deps.nix { inherit fetchHex fetchFromGitHub; };
in stdenv.mkDerivation {
inherit version;
pname = "erlang-ls";
buildInputs = [ (rebar3WithPlugins { }) ];
src = fetchFromGitHub {
inherit owner repo;
sha256 = "1s6zk8r5plm7ajifz17mvfrnk5mzbhj7alayink9phqbmzrypnfg";
rev = version;
};
buildPhase = ''
mkdir _checkouts
${toString (lib.mapAttrsToList (k: v: ''
cp -R ${v} _checkouts/${k}
'') deps)}
make
'';
installPhase = ''
mkdir -p $out/bin
cp _build/default/bin/erlang_ls $out/bin/
cp _build/dap/bin/els_dap $out/bin/
'';
meta = with lib; {
homepage = "https://github.com/erlang-ls/erlang_ls";
description = "The Erlang Language Server";
platforms = platforms.unix;
license = licenses.asl20;
};
}

View file

@ -0,0 +1,90 @@
# Generated by rebar3_nix
{ fetchHex, fetchFromGitHub }:
{
getopt = fetchHex {
pkg = "getopt";
version = "1.0.1";
sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw=";
};
zipper = fetchHex {
pkg = "zipper";
version = "1.0.1";
sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0=";
};
quickrand = fetchHex {
pkg = "quickrand";
version = "2.0.1";
sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY=";
};
providers = fetchHex {
pkg = "providers";
version = "1.8.1";
sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A=";
};
katana_code = fetchHex {
pkg = "katana_code";
version = "0.2.1";
sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI=";
};
bucs = fetchHex {
pkg = "bucs";
version = "1.0.16";
sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI=";
};
yamerl = fetchHex {
pkg = "yamerl";
version = "0.8.1";
sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8=";
};
uuid = fetchHex {
pkg = "uuid_erl";
version = "2.0.1";
sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs=";
};
tdiff = fetchHex {
pkg = "tdiff";
version = "0.1.2";
sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU=";
};
redbug = fetchHex {
pkg = "redbug";
version = "2.0.6";
sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ=";
};
rebar3_format = fetchHex {
pkg = "rebar3_format";
version = "0.8.2";
sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM=";
};
ranch = fetchHex {
pkg = "ranch";
version = "1.7.1";
sha256 = "sha256-RR2FJ3h99xbZncNhYvygWTSRXbC2FBu9rC6o08evx9c=";
};
jsx = fetchHex {
pkg = "jsx";
version = "3.0.0";
sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0=";
};
erlfmt = fetchFromGitHub {
owner = "whatsapp";
repo = "erlfmt";
rev = "2e93fc4a646111357642b0179a2a63151868d890";
sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr";
};
ephemeral = fetchHex {
pkg = "ephemeral";
version = "2.0.4";
sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA=";
};
elvis_core = fetchHex {
pkg = "elvis_core";
version = "1.1.1";
sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI=";
};
docsh = fetchHex {
pkg = "docsh";
version = "0.7.2";
sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ=";
};
}

View file

@ -53,7 +53,7 @@ stdenv.mkDerivation {
# Add the packInstall path to the swipl pack search path
postPatch = ''
echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> /build/$sourceRoot/boot/init.pl
echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> boot/init.pl
'';
nativeBuildInputs = [ cmake pkg-config ];

View file

@ -10,6 +10,7 @@
, libpng
, boost
, guile
, stdenv
}:
mkDerivation {
@ -26,8 +27,19 @@ mkDerivation {
nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ];
buildInputs = [ eigen zlib libpng boost guile ];
# Link "Studio" binary to "libfive-studio" to be more obvious:
postFixup = ''
postInstall = if stdenv.isDarwin then ''
# No rules to install the mac app, so do it manually.
mkdir -p $out/Applications
cp -r studio/Studio.app $out/Applications/Studio.app
install_name_tool \
-change libfive.dylib $out/lib/libfive.dylib \
-change libfive-guile.dylib $out/lib/libfive-guile.dylib \
$out/Applications/Studio.app/Contents/MacOS/Studio
wrapQtApp $out/Applications/Studio.app/Contents/MacOS/Studio
'' else ''
# Link "Studio" binary to "libfive-studio" to be more obvious:
ln -s "$out/bin/Studio" "$out/bin/libfive-studio"
'';

View file

@ -1,4 +1,4 @@
{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }:
{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix, bash}:
stdenv.mkDerivation {
pname = "libnixxml";
@ -11,17 +11,45 @@ stdenv.mkDerivation {
sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ=";
};
preConfigure = ''
./bootstrap
prePatch = ''
# Remove broken test
substituteInPlace tests/draw/Makefile.am \
--replace "draw-wrong.sh" ""
rm tests/draw/draw-wrong.sh
# Fix bash path
substituteInPlace scripts/nixexpr2xml.in \
--replace "/bin/bash" "${bash}/bin/bash"
'';
preAutoreconf = ''
# Copied from bootstrap script
ln -s README.md README
mkdir -p config
'';
configureFlags = [ "--with-gd" "--with-glib" ];
CFLAGS = "-Wall";
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libxml2 gd.dev glib getopt libxslt nix ];
strictDeps = true;
nativeBuildInputs = [
autoreconfHook
pkg-config
getopt
libxslt
];
buildInputs = [
bash
libxml2
gd.dev
glib
nix
];
checkInputs = [
nix
];
doCheck = false;
doCheck = true;
meta = with lib; {
description = "XML-based Nix-friendly data integration library";

View file

@ -1,22 +1,44 @@
{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }:
{ lib
, stdenv
, fetchurl
, fetchFromGitHub
, fixDarwinDylibNames
}:
with lib; stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "tbb";
version = "2020_U3";
version = "2020.3";
src = fetchFromGitHub {
owner = "01org";
repo = "tbb";
rev = version;
sha256 = "sha256-prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU=";
owner = "oneapi-src";
repo = "oneTBB";
rev = "v${version}";
sha256 = "prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU=";
};
nativeBuildInputs = optional stdenv.isDarwin fixDarwinDylibNames;
patches = [
# Fixes build with Musl.
(fetchurl {
url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch";
sha256 = "gUfXQ9OZQ82qD6brgauBCsKdjLvyHafMc18B+KxZoYs=";
})
makeFlags = optional (compiler != null) "compiler=${compiler}"
++ optional (stdver != null) "stdver=${stdver}";
# Fixes build with Musl.
(fetchurl {
url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch";
sha256 = "fhorfqO1hHKZ61uq+yTR7eQ8KYdyLwpM3K7WpwJpV74=";
})
];
patches = lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch;
nativeBuildInputs = lib.optionals stdenv.isDarwin [
fixDarwinDylibNames
];
makeFlags = lib.optionals stdenv.cc.isClang [
"compiler=clang"
];
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
@ -29,9 +51,24 @@ with lib; stdenv.mkDerivation rec {
runHook postInstall
'';
enableParallelBuilding = true;
postInstall = let
pcTemplate = fetchurl {
url = "https://github.com/oneapi-src/oneTBB/raw/master/integration/pkg-config/tbb.pc.in";
sha256 = "2pCad9txSpNbzac0vp/VY3x7HNySaYkbH3Rx8LK53pI=";
};
in ''
# Generate pkg-config file based on upstream template.
# It should not be necessary with tbb after 2021.2.
mkdir -p "$out/lib/pkgconfig"
substitute "${pcTemplate}" "$out/lib/pkgconfig/tbb.pc" \
--subst-var-by CMAKE_INSTALL_PREFIX "$out" \
--subst-var-by CMAKE_INSTALL_LIBDIR "lib" \
--subst-var-by CMAKE_INSTALL_INCLUDEDIR "include" \
--subst-var-by TBB_VERSION "${version}" \
--subst-var-by TBB_LIB_NAME "tbb"
'';
meta = {
meta = with lib; {
description = "Intel Thread Building Blocks C++ Library";
homepage = "http://threadingbuildingblocks.org/";
license = licenses.asl20;
@ -43,7 +80,7 @@ with lib; stdenv.mkDerivation rec {
represents a higher-level, task-based parallelism that abstracts platform
details and threading mechanisms for scalability and performance.
'';
platforms = with platforms; linux ++ darwin;
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice dizfer ];
};
}

View file

@ -1,43 +0,0 @@
From b577153a10c98f4e13405dc93ea2ab1a7b990e07 Mon Sep 17 00:00:00 2001
From: David Huffman <storedbox+alpine@outlook.com>
Date: Wed, 6 Jan 2016 07:09:30 -0500
Subject: [PATCH] hard-code glibc's definition of struct mallinfo
---
src/tbbmalloc/proxy.h | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/src/tbbmalloc/proxy.h b/src/tbbmalloc/proxy.h
index 781cadc..e1ea1ae 100644
--- a/src/tbbmalloc/proxy.h
+++ b/src/tbbmalloc/proxy.h
@@ -32,6 +32,26 @@
#include <stddef.h>
+// The following definition was taken from /usr/include/malloc.h as provided by
+// the glibc-devel-2.19-17.4.x86_64 package on openSUSE Leap 42.1; it is
+// made available under the GNU Lesser General Public License v2.1 or later.
+// See <https://www.gnu.org/licenses>.
+//
+// Copyright (C) 1996-2014 Free Software Foundation, Inc.
+struct mallinfo
+{
+ int arena; /* non-mmapped space allocated from system */
+ int ordblks; /* number of free chunks */
+ int smblks; /* number of fastbin blocks */
+ int hblks; /* number of mmapped regions */
+ int hblkhd; /* space in mmapped regions */
+ int usmblks; /* maximum total allocated space */
+ int fsmblks; /* space available in freed fastbin blocks */
+ int uordblks; /* total allocated space */
+ int fordblks; /* total free space */
+ int keepcost; /* top-most, releasable (via malloc_trim) space */
+};
+
extern "C" {
void * scalable_malloc(size_t size);
void * scalable_calloc(size_t nobj, size_t size);
--
2.6.2

View file

@ -60,8 +60,9 @@ let
};
});
bitwarden-cli = pkgs.lib.overrideDerivation super."@bitwarden/cli" (drv: {
bitwarden-cli = super."@bitwarden/cli".override (drv: {
name = "bitwarden-cli-${drv.version}";
meta.mainProgram = "bw";
});
fast-cli = super."fast-cli-1.x".override {

View file

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "2.6.6";
version = "2.7.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-LdBUtU5rNoixh7DPIFkHxLMvBeI6MZH57sO0IjuOQAw=";
sha256 = "sha256-PCoSJnt8EptVq5u0+NgEBwY6zLkD87XqVRBDdqBziM8=";
};
propagatedBuildInputs = [ attrs protobuf zeroconf ];

View file

@ -1,37 +0,0 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
, django, futures ? null, mock ? null, jinja2, jsmin, slimit }:
buildPythonPackage rec {
pname = "django-pipeline";
version = "1.6.14";
# no tests on PyPI
src = fetchFromGitHub {
owner = "jazzband";
repo = pname;
rev = version;
sha256 = "1xf732bd17mgha75jfhlnms46ib2pffhpfa0ca7bmng9jhbvsl9j";
};
postPatch = ''
substituteInPlace tests/tests/test_compiler.py \
--replace "/usr/bin/env" ""
'';
propagatedBuildInputs = [ django ] ++ lib.optional (!isPy3k) futures;
checkInputs = [ jinja2 jsmin slimit ] ++ lib.optional (!isPy3k) mock;
checkPhase = ''
export PYTHONPATH=.:$PYTHONPATH
export DJANGO_SETTINGS_MODULE=tests.settings
${django}/bin/django-admin.py test tests
'';
meta = with lib; {
description = "Pipeline is an asset packaging library for Django";
homepage = "https://github.com/cyberdelia/django-pipeline";
license = licenses.mit;
broken = true;
};
}

View file

@ -4,6 +4,8 @@
, glibcLocales
, setuptools_scm
, wcwidth
, importlib-metadata
, pythonOlder
}:
buildPythonPackage rec {
@ -18,7 +20,11 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools_scm ];
buildInputs = [ glibcLocales ];
propagatedBuildInputs = [ wcwidth ];
propagatedBuildInputs = [
wcwidth
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
preCheck = ''
export LANG="en_US.UTF-8"

View file

@ -35,6 +35,9 @@ let newPython = python3.override {
inherit version;
sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96";
};
disabledTests = [
"test_ec_verify_should_return_false_if_signature_invalid"
];
});
};
};

View file

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "go-toml";
version = "1.9.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "pelletier";
repo = pname;
rev = "v${version}";
sha256 = "sha256-m8VgjfNDxSX6fRG2/gEJlVc9hCnua+o79ttrd8P20kU=";
sha256 = "sha256-O3gfQon8ktObLVED4A5sCSOw8K1NIXP3a5AsLq3Svb4=";
};
goPackagePath = "github.com/pelletier/go-toml";

View file

@ -14,9 +14,6 @@ in stdenv.mkDerivation rec {
preConfigure = ''
export SYBASE=${freetds}
substituteInPlace src/cmd_connect.c \
--replace CS_TDS_80 CS_TDS_73
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace configure --replace "libct.so" "libct.dylib"
'';
@ -27,6 +24,17 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
patches = [
(fetchurl {
# https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/databases/sqsh/patches/patch-src_cmd_connect_c
name = "patch-src_cmd_connect_c.patch";
url = "https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/databases/sqsh/patches/patch-src_cmd_connect_c?rev=1.2&content-type=text/plain";
sha256 = "1dz97knr2h0a0ca1vq2mx6h8s3ns9jb1a0qraa4wkfmcdi3aqw0j";
})
];
patchFlags = [ "-p0" ];
meta = with lib; {
description = "Command line tool for querying Sybase/MSSQL databases";
longDescription = ''

View file

@ -1,5 +1,5 @@
{ lib
, stdenv
, gccStdenv
, fetchFromGitHub
, autoreconfHook
, xorgproto
@ -7,7 +7,7 @@
, libXpm
}:
stdenv.mkDerivation rec {
gccStdenv.mkDerivation rec {
pname = "0verkill";
version = "unstable-2011-01-13";

View file

@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec {
mv $out/bin/steam-tui $out/bin/.steam-tui-unwrapped
cat > $out/bin/steam-tui <<EOF
#!${runtimeShell}
exec steam-run $out/bin/.steam-tui-unwrapped '$@'
export PATH=${steamcmd}/bin:\$PATH
exec ${steam-run-native}/bin/steam-run $out/bin/.steam-tui-unwrapped '\$@'
EOF
chmod +x $out/bin/steam-tui
'';

View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
let
version = "5.11.19";
version = "5.11.20";
suffix = "lqx1";
in
@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
sha256 = "17gdlkixsy68j6c7lpkkk242x71rqj78hpqg3kp01fckj633za5n";
sha256 = "0pdn3p9v3jasgf4xffirijlx20qp9gglzlksk2gmyzg9lmf5dygi";
};
extraMeta = {

View file

@ -24,7 +24,11 @@ stdenv.mkDerivation rec {
'';
NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap";
NIX_CFLAGS_COMPILE = "-Wno-error=enum-conversion";
# On gcc9, this would produce
# error: '-Werror=enum-conversion': no option -Wenum-conversion
NIX_CFLAGS_COMPILE = lib.optionalString (lib.versionAtLeast stdenv.cc.version "10")
"-Wno-error=enum-conversion";
enableParallelBuilding = true;

View file

@ -20,9 +20,19 @@ buildGoModule rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ taglib alsaLib ] ++ lib.optionals transcodingSupport [ ffmpeg ];
buildInputs = [ taglib alsaLib ];
vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9";
# TODO(Profpatsch): write a test for transcoding support,
# since it is prone to break
postPatch = lib.optionalString transcodingSupport ''
substituteInPlace \
server/encode/encode.go \
--replace \
'"ffmpeg"' \
'"${lib.getBin ffmpeg}/bin/ffmpeg"'
'';
meta = {
homepage = "https://github.com/sentriz/gonic";
description = "Music streaming server / subsonic server API implementation";

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "abcMIDI";
version = "2021.05.09";
version = "2021.05.10";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
sha256 = "sha256-LgtS7IOGkw0K70UAP2a57ghIiJujVnQO5+j4ZanPZp4=";
sha256 = "sha256-ID27OdtuSYtD8bOPb6b0vUDdRqJvRX5TsjRBILTom4o=";
};
meta = with lib; {

View file

@ -13,7 +13,10 @@ stdenv.mkDerivation {
buildInputs = [ libsoundio lame ];
makeFlags = [ "PREFIX=$(out)" ];
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
"PREFIX=$(out)"
];
meta = with lib; {
description = "CLI tool to record audio-enabled screencasts of your terminal, for the web";

View file

@ -1,5 +1,7 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }:
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, which
, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick
, Foundation
}:
stdenv.mkDerivation rec {
version = "1.6.0";
@ -23,7 +25,8 @@ stdenv.mkDerivation rec {
docbook_xsl
];
buildInputs = [ glib imagemagick ] ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ];
buildInputs = [ glib imagemagick ]
++ lib.optional stdenv.isDarwin Foundation;
patches = [ ./xmlcatalog_patch.patch ];

View file

@ -0,0 +1,35 @@
{ lib
, stdenv
, fetchFromGitLab
, pkg-config
, libusb1
}:
stdenv.mkDerivation rec {
pname = "minipro";
version = "0.5";
src = fetchFromGitLab {
owner = "DavidGriffith";
repo = "minipro";
rev = version;
sha256 = "sha256-Hyj2LyY7W8opjigH+QLHHbDyelC0LMgGgdN+u3nNoJc=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libusb1 ];
makeFlags = [
"PREFIX=$(out)"
"UDEV_DIR=$(out)/lib/udev"
"COMPLETIONS_DIR=$(out)/share/bash-completion/completions"
"PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"
"CC=${stdenv.cc.targetPrefix}cc"
];
meta = with lib; {
homepage = "https://gitlab.com/DavidGriffith/minipro";
description = "An open source program for controlling the MiniPRO TL866xx series of chip programmers";
license = licenses.gpl3Plus;
maintainers = [ maintainers.bmwalters ];
};
}

View file

@ -0,0 +1,28 @@
{ lib, stdenv, fetchFromGitHub, cmake, gtest, openssl, zlib }:
stdenv.mkDerivation rec {
pname = "libtorrent-jesec";
version = "0.13.8-r1";
src = fetchFromGitHub {
owner = "jesec";
repo = "libtorrent";
rev = "v${version}";
sha256 = "sha256-Eh5pMkSe9uO0dPRWDg2BbbRxxuvX9FM2/OReq/61ojc=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ openssl zlib ];
# https://github.com/jesec/libtorrent/issues/1
doCheck = false;
checkInputs = [ gtest ];
meta = with lib; {
description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code (jesec's fork)";
homepage = "https://github.com/jesec/libtorrent";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ winterqt ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,57 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, gtest
, libtorrent-jesec
, curl
, ncurses
, xmlrpc_c
, nlohmann_json
, xmlRpcSupport ? true
, jsonRpcSupport ? true
}:
let
inherit (lib) optional;
in
stdenv.mkDerivation rec {
pname = "rtorrent-jesec";
version = "0.9.8-r13";
src = fetchFromGitHub {
owner = "jesec";
repo = "rtorrent";
rev = "v${version}";
sha256 = "1srn1ms7dvsn994zvb8i4m6gc144ygc7wc2a23bma79cqpl7drlw";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libtorrent-jesec curl ncurses ]
++ optional xmlRpcSupport xmlrpc_c
++ optional jsonRpcSupport nlohmann_json;
cmakeFlags = [ "-DUSE_RUNTIME_CA_DETECTION=NO" ]
++ optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO"
++ optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO";
doCheck = true;
checkInputs = [ gtest ];
prePatch = ''
substituteInPlace src/main.cc \
--replace "/etc/rtorrent/rtorrent.rc" "${placeholder "out"}/etc/rtorrent/rtorrent.rc"
'';
postFixup = ''
mkdir -p $out/etc/rtorrent
cp $src/doc/rtorrent.rc $out/etc/rtorrent/rtorrent.rc
'';
meta = with lib; {
description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach (jesec's fork)";
homepage = "https://github.com/jesec/rtorrent";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ winterqt ];
platforms = platforms.linux;
};
}

View file

@ -1,8 +1,7 @@
{ lib
, buildGoModule
, fetchFromGitHub
, python3Packages
, perl
, yuicompressor
, zopfli
, stdenv
}:
@ -23,8 +22,7 @@ buildGoModule {
doCheck = false;
nativeBuildInputs = [
python3Packages.slimit
(perl.withPackages (p: [ p.CSSMinifier ]))
yuicompressor
zopfli
];

View file

@ -3654,7 +3654,9 @@ in
cfssl = callPackage ../tools/security/cfssl { };
chafa = callPackage ../tools/misc/chafa { };
chafa = callPackage ../tools/misc/chafa {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
checkbashisms = callPackage ../development/tools/misc/checkbashisms { };
@ -6196,6 +6198,8 @@ in
minidlna = callPackage ../tools/networking/minidlna { };
minipro = callPackage ../tools/misc/minipro { };
minisign = callPackage ../tools/security/minisign { };
ministat = callPackage ../tools/misc/ministat { };
@ -6449,6 +6453,8 @@ in
libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
libtorrent-jesec = callPackage ../tools/networking/p2p/libtorrent-jesec { };
libmpack = callPackage ../development/libraries/libmpack { };
libiberty = callPackage ../development/libraries/libiberty { };
@ -8167,6 +8173,8 @@ in
rtorrent = callPackage ../tools/networking/p2p/rtorrent { };
rtorrent-jesec = callPackage ../tools/networking/p2p/rtorrent-jesec { };
rubber = callPackage ../tools/typesetting/rubber { };
rubocop = callPackage ../development/tools/rubocop { };
@ -11881,6 +11889,7 @@ in
erlang_nox = beam_nox.interpreters.erlang;
inherit (beam.packages.erlang)
erlang-ls
rebar rebar3 rebar3WithPlugins
fetchHex beamPackages
relxExe;

View file

@ -1928,8 +1928,6 @@ in {
django-picklefield = callPackage ../development/python-modules/django-picklefield { };
django_pipeline = callPackage ../development/python-modules/django-pipeline { };
django_polymorphic = callPackage ../development/python-modules/django-polymorphic { };
django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { };