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

Merge pull request #122068 from NixOS/staging-next

Browse Source 
Staging next
This commit is contained in:
Jonathan Ringer
2021-05-16 12:25:50 -07:00
committed by GitHub
parent b3a8cab594 8c6d819143
commit 2ba3a65a7d
407 changed files with 13563 additions and 2796 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/chezmoi/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
version = "2.0.10";
version = "2.0.11";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "sha256-WVG4rww9Wd1H6zw5lRBErX9VwnA21dhvith9BQFYqxw=";
sha256 = "sha256-z9ALpoF2ZLigAG/uvoYVG1YTy+EM4bDQDDtxd3PgQW8=";
};
vendorSha256 = "sha256-khYcNP3xAXeQR9vaghkGq8x6KB1k5hLEcE7Zx8H+CfA=";
vendorSha256 = "sha256-CYDFEVZ04csn4BjvwUvfOafEjucnDHyeYU7gNwO1xTQ=";
doCheck = false;
pkgs/tools/misc/fontforge/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchpatch, fetchFromGitHub, lib
, cmake, perl, uthash, pkg-config, gettext
, python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango
, python, freetype, zlib, glib, giflib, libpng, libjpeg, libtiff, libxml2, cairo, pango
, readline, woff2, zeromq, libuninameslist
, withSpiro ? false, libspiro
, withGTK ? false, gtk3
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [
readline uthash woff2 zeromq libuninameslist
python freetype zlib glib libungif libpng libjpeg libtiff libxml2
python freetype zlib glib giflib libpng libjpeg libtiff libxml2
]
++ lib.optionals withSpiro [libspiro]
++ lib.optionals withGUI [ gtk3 cairo pango ]
pkgs/tools/misc/gringo/default.nix
+2 -2
View File
@@ -32,12 +32,12 @@ stdenv.mkDerivation {
substituteInPlace ./SConstruct \
--replace \
"env['CPPPATH'] = []" \
"env['CPPPATH'] = ['${libcxx}/include/c++/v1']"
"env['CPPPATH'] = ['${lib.getDev libcxx}/include/c++/v1']"
substituteInPlace ./SConstruct \
--replace \
"env['LIBPATH'] = []" \
"env['LIBPATH'] = ['${libcxx}/lib']"
"env['LIBPATH'] = ['${lib.getLib libcxx}/lib']"
'';
buildPhase = ''
pkgs/tools/misc/silicon/default.nix
+1 -1
View File
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ cmake pkg-config ]
++ lib.optionals stdenv.isLinux [ python3 ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
meta = with lib; {
description = "Create beautiful image of your source code";
pkgs/tools/misc/tremor-rs/default.nix
+1 -1
View File
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
--zsh <($out/bin/tremor completions zsh)
'';
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
# OPENSSL_NO_VENDOR - If set, always find OpenSSL in the system, even if the vendored feature is enabled.
OPENSSL_NO_VENDOR = 1;