public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-05-08 20:59:05 +02:00
parent 252bf94a74 6d46d8a9b9
commit dd78ce1c53
730 changed files with 3907 additions and 1907 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/analysis/include-what-you-use/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cmake, llvmPackages, python2 }:
{ lib, stdenv, fetchurl, cmake, llvmPackages, python3 }:
stdenv.mkDerivation rec {
pname = "include-what-you-use";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz";
};
buildInputs = with llvmPackages; [ clang-unwrapped llvm python2 ];
nativeBuildInputs = [ cmake ];
nativeBuildInputs = with llvmPackages; [ cmake llvm.dev llvm clang-unwrapped python3];
buildInputs = [ llvmPackages.libclang ];
cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ];
pkgs/development/tools/analysis/massif-visualizer/default.nix
+1 -1
View File
@@ -25,6 +25,6 @@ mkDerivation rec {
description = "Tool that visualizes massif data generated by valgrind";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ lethalman zraexy ];
maintainers = with maintainers; [ zraexy ];
};
}
pkgs/development/tools/async-profiler/0001-Fix-darwin-build.patch
+27
View File
@@ -0,0 +1,27 @@
From e54c17899118ea940c36bc17a48d8ff759243f16 Mon Sep 17 00:00:00 2001
From: Uri Baghin <uri@canva.com>
Date: Sat, 8 May 2021 09:49:18 +1000
Subject: [PATCH] Fix darwin build.
---
src/itimer.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/itimer.cpp b/src/itimer.cpp
index 08c46d1..52628ef 100644
--- a/src/itimer.cpp
+++ b/src/itimer.cpp
@@ -52,8 +52,8 @@ Error ITimer::start(Arguments& args) {
OS::installSignalHandler(SIGPROF, signalHandler);
- long sec = _interval / 1000000000;
- long usec = (_interval % 1000000000) / 1000;
+ time_t sec = _interval / 1000000000;
+ suseconds_t usec = (_interval % 1000000000) / 1000;
struct itimerval tv = {{sec, usec}, {sec, usec}};
if (setitimer(ITIMER_PROF, &tv, NULL) != 0) {
--
2.31.1
pkgs/development/tools/async-profiler/default.nix
+5
View File
@@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
patches = [
# https://github.com/jvm-profiling-tools/async-profiler/pull/428
./0001-Fix-darwin-build.patch
];
fixupPhase = ''
substituteInPlace $out/bin/async-profiler \
--replace 'JATTACH=$SCRIPT_DIR/build/jattach' \
pkgs/development/tools/backblaze-b2/default.nix
+26 -6
View File
@@ -1,21 +1,41 @@
{ fetchFromGitHub, lib, python3Packages }:
let
python3Packages2 = python3Packages.override {
overrides = self: super: {
arrow = self.callPackage ../../python-modules/arrow/2.nix { };
};
};
in
let
python3Packages = python3Packages2; # two separate let … in to avoid infinite recursion
in
python3Packages.buildPythonApplication rec {
pname = "backblaze-b2";
version = "2.1.0";
version = "2.4.0";
src = fetchFromGitHub {
owner = "Backblaze";
repo = "B2_Command_Line_Tool";
rev = "v${version}";
sha256 = "1kkpvxqgh5pw4kr8lh5gy9d7960hv9zvajbjiqhj6xgykwbpbgmq";
src = python3Packages.fetchPypi {
inherit version;
pname = "b2";
sha256 = "sha256-nNQDdSjUolj3PjWRn1fPBAEtPlgeent2PxzHqwH1Z6s=";
};
postPatch = ''
substituteInPlace setup.py \
--replace 'setuptools_scm<6.0' 'setuptools_scm'
'';
propagatedBuildInputs = with python3Packages; [
b2sdk
class-registry
phx-class-registry
setuptools
docutils
rst2ansi
];
nativeBuildInputs = with python3Packages; [
setuptools-scm
];
checkInputs = with python3Packages; [ pytestCheckHook ];
pkgs/development/tools/castxml/default.nix
+3 -2
View File
@@ -25,13 +25,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
llvm
llvm.dev
] ++ lib.optionals (withManual || withHTML) [
sphinx
];
cmakeFlags = [
"-DCLANG_RESOURCE_DIR=${libclang.dev}/lib/clang/${lib.getVersion libclang}/"
"-DCLANG_RESOURCE_DIR=${libclang.dev}/"
"-DSPHINX_HTML=${if withHTML then "ON" else "OFF"}"
"-DSPHINX_MAN=${if withManual then "ON" else "OFF"}"
];
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
libffi
libxml2
zlib
libclang
];
propagatedBuildInputs = [
pkgs/development/tools/documentation/gnome-doc-utils/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3
{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome
, python2Packages }:
python2Packages.buildPythonApplication rec {
@@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec {
propagatedBuildInputs = [ libxml2Python ];
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
};
};
pkgs/development/tools/documentation/gtk-doc/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
, docbook-xsl-nons
, libxslt
, gettext
, gnome3
, gnome
, withDblatex ? false, dblatex
}:
@@ -77,7 +77,7 @@ python3.pkgs.buildPythonApplication rec {
passthru = {
# Consumers are expected to copy the m4 files to their source tree, let them reuse the patch
respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch;
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "none";
};
pkgs/development/tools/glade/default.nix
+3 -3
View File
@@ -15,7 +15,7 @@
, libxml2
, docbook-xsl-nons
, docbook_xml_dtd_42
, gnome3
, gnome
, gdk-pixbuf
, libxslt
, gsettings-desktop-schemas
@@ -54,11 +54,11 @@ stdenv.mkDerivation rec {
python3.pkgs.pygobject3
gsettings-desktop-schemas
gdk-pixbuf
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
];
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
};
};
pkgs/development/tools/irony-server/default.nix
+1 -1
View File
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
pname = "irony-server";
inherit (irony) src version;
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake llvmPackages.llvm.dev ];
buildInputs = [ llvmPackages.libclang llvmPackages.llvm ];
dontUseCmakeBuildDir = true;
pkgs/development/tools/misc/ccls/default.nix
+2 -2
View File
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-jipSipgD0avd7XODlpxnqjHK3s6nacaxbIQIddix7X8=";
};
nativeBuildInputs = [ cmake ];
buildInputs = with llvmPackages; [ clang-unwrapped llvm rapidjson ];
nativeBuildInputs = [ cmake llvmPackages.llvm.dev ];
buildInputs = with llvmPackages; [ libclang llvm rapidjson ];
cmakeFlags = [ "-DCCLS_VERSION=${version}" ];
pkgs/development/tools/misc/d-feet/default.nix
+3 -3
View File
@@ -7,7 +7,7 @@
, gtk3
, python3
, wrapGAppsHook
, gnome3
, gnome
, libwnck3
, gobject-introspection
, gettext
@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec {
buildInputs = [
glib
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
gtk3
libwnck3
];
@@ -61,7 +61,7 @@ python3.pkgs.buildPythonApplication rec {
'';
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "dfeet";
versionPolicy = "none";
pkgs/development/tools/misc/gob2/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, glib, bison, flex, gnome3 }:
{ lib, stdenv, fetchurl, pkg-config, glib, bison, flex, gnome }:
stdenv.mkDerivation rec {
pname = "gob2";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib bison flex ];
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "none";
};
pkgs/development/tools/misc/msitools/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
, libgsf
, gcab
, bzip2
, gnome3
, gnome
}:
stdenv.mkDerivation rec {
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "none";
};
pkgs/development/tools/misc/opengrok/default.nix
+1 -1
View File
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
description = "Source code search and cross reference engine";
homepage = "https://opengrok.github.io/OpenGrok/";
license = licenses.cddl;
maintainers = [ maintainers.lethalman ];
maintainers = [ ];
};
}
pkgs/development/tools/nemiver/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, fetchurl
, fetchpatch
, pkg-config
, gnome3
, gnome
, gtk3
, libxml2
, intltool
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = "nemiver";
versionPolicy = "none";
};
pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+1 -1
View File
@@ -512,7 +512,7 @@ self: super:
# Set directory containing llvm-config binary
preConfigure = ''
export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config
export LLVM_CONFIG=${pkgs.llvm.dev}/bin/llvm-config
'';
__impureHostDeps = lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
pkgs/development/tools/profiling/sysprof/default.nix
+3 -3
View File
@@ -16,7 +16,7 @@
, shared-mime-info
, systemd
, wrapGAppsHook
, gnome3
, gnome
}:
stdenv.mkDerivation rec {
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
pkg-config
shared-mime-info
wrapGAppsHook
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
];
buildInputs = [
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
pkgs/development/tools/react-native-debugger/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core
{ lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome, atk, at-spi2-atk, at-spi2-core
, gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem
}:
pkgs/development/tools/rtags/default.nix
+2 -2
View File
@@ -3,8 +3,8 @@
stdenv.mkDerivation rec {
pname = "rtags";
version = "2.38";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ llvmPackages.llvm openssl emacs ]
nativeBuildInputs = [ cmake pkg-config llvmPackages.llvm.dev ];
buildInputs = [ llvmPackages.llvm llvmPackages.libclang openssl emacs ]
++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ]
++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ];
pkgs/development/tools/vala-language-server/default.nix
+1 -1
View File
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
description = "Code Intelligence for Vala & Genie";
homepage = "https://github.com/benwaffle/vala-language-server";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ andreasfelix worldofpeace ];
maintainers = with maintainers; [ andreasfelix ];
platforms = platforms.linux;
};
}