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

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Fix cargo-flash build
This commit is contained in:
Jonathan Ringer
2021-05-16 18:27:14 -07:00
parent 6020fe2508 8aea69e5ab
commit d8e62d8e41
80 changed files with 906 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/diffoscope/default.nix
+4 -4
View File
@@ -2,7 +2,7 @@
, abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
, e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
, gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R
, sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd
, radare2, sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd
, enableBloat ? false
}:
@@ -16,11 +16,11 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "172";
version = "175";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "1j162jh5lkiixpb5ym3smyrkvjldm8m8vnx25cgwb7cxkk701w5x";
sha256 = "sha256-ofRu5bD+kymdXdViPxfGD/2cf7lUvnEQfYAqog5GIIk=";
};
outputs = [ "out" "man" ];
@@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec {
++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ]
++ lib.optionals enableBloat ([
abootimg apksigner apktool cbfstool colord ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric
hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt
hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt radare2
] ++ (with python3Packages; [ binwalk guestfs h5py ]));
checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath;
pkgs/tools/misc/handlr/default.nix
+2 -1
View File
@@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub, shared-mime-info }:
{ lib, stdenv, rustPlatform, fetchFromGitHub, shared-mime-info, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "handlr";
@@ -14,6 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-xDQV8wVlzItz0lzR1nVRPVsg7nSf/khUhevDlGgSO3g=";
nativeBuildInputs = [ shared-mime-info ];
buildInputs = lib.optional stdenv.isDarwin libiconv;
preCheck = ''
export HOME=$TEMPDIR
pkgs/tools/misc/heimdall/default.nix
+5 -1
View File
@@ -31,7 +31,11 @@ mkDerivation {
substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" ""
'';
installPhase = ''
installPhase = lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications
mv bin/heimdall-frontend.app $out/Applications/heimdall-frontend.app
wrapQtApp $out/Applications/heimdall-frontend.app/Contents/MacOS/heimdall-frontend
'' + ''
mkdir -p $out/{bin,share/doc/heimdall,lib/udev/rules.d}
install -m755 -t $out/bin bin/*
install -m644 -t $out/lib/udev/rules.d ../heimdall/60-heimdall.rules
pkgs/tools/misc/krapslog/default.nix
+3 -1
View File
@@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub }:
{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "krapslog";
@@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-rcLsqMegCos+v0OkdRvH9xoopE7R/njEUVteMY/6mj8=";
buildInputs = lib.optional stdenv.isDarwin libiconv;
meta = with lib; {
description = "Visualize a log file with sparklines";
homepage = "https://github.com/acj/krapslog-rs";
pkgs/tools/misc/pistol/default.nix
+12 -2
View File
@@ -2,17 +2,19 @@
, buildGoModule
, fetchFromGitHub
, file
, installShellFiles
, asciidoctor
}:
buildGoModule rec {
pname = "pistol";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "doronbehar";
repo = pname;
rev = "v${version}";
sha256 = "sha256-c85XF1Glg6A7utPfXOv4LBesJy9+ErE2B+DO243mMhg=";
sha256 = "sha256-NUHk48P3kUx+e9BR9k9K/VaHnbZ6Do6RRf1S0974sO8=";
};
vendorSha256 = "sha256-n98cjXsgg2w3shbZPnk3g7mBbzV5Tc3jd9ZtiRk1KUM=";
@@ -24,6 +26,14 @@ buildGoModule rec {
buildInputs = [
file
];
nativeBuildInputs = [
installShellFiles
asciidoctor
];
postBuild = ''
asciidoctor -b manpage -d manpage README.adoc
installManPage pistol.1
'';
buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ];
pkgs/tools/misc/plantuml-server/default.nix
+19 -7
View File
@@ -1,30 +1,34 @@
{ lib, stdenv, fetchFromGitHub, maven, jdk }:
{ lib, stdenv, fetchFromGitHub, maven, jdk8_headless }:
let
version = "1.2020.14";
version = "1.2021.6";
src = fetchFromGitHub {
owner = "plantuml";
repo = "plantuml-server";
rev = "v${version}";
sha256 = "08g6ddpkly5yhjhw7gpsanyspar1752jy9cypwxsqrdzqrv738b8";
sha256 = "sha256:1v69vabdq9pv75wzb6n5s198iy5ijfcx6lgjqwxz7n5ns3blf6sz";
};
# perform fake build to make a fixed-output derivation out of the files downloaded from maven central
deps = stdenv.mkDerivation {
name = "plantuml-server-${version}-deps";
inherit src;
buildInputs = [ jdk maven ];
nativeBuildInputs = [ jdk8_headless maven ];
buildPhase = ''
runHook preBuild
while mvn package -Dmaven.repo.local=$out/.m2; [ $? = 1 ]; do
echo "timeout, restart maven to continue downloading"
done
runHook postBuild
'';
# keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1wwgyjalhlj5azggs9vvsrr54pg7gl8p36pgf6pk12rsszzl7a97";
outputHash = "sha256:1fvir7yvg4a4dc4kiv2d5q081cygj7s2lmxj90j8zzkggyq7v8zh";
};
in
@@ -33,25 +37,33 @@ stdenv.mkDerivation rec {
inherit version;
inherit src;
buildInputs = [ jdk maven ];
nativeBuildInputs = [ jdk8_headless maven ];
buildPhase = ''
runHook preBuild
# 'maven.repo.local' must be writable so copy it out of nix store
cp -R $src repo
chmod +w -R repo
cd repo
mvn package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p "$out/webapps"
cp "target/plantuml.war" "$out/webapps/plantuml.war"
runHook postInstall
'';
meta = with lib; {
description = "A web application to generate UML diagrams on-the-fly.";
homepage = "https://plantuml.com/";
license = licenses.gpl3;
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = with maintainers; [ truh ];
};
pkgs/tools/misc/youtube-dl/default.nix
+2 -2
View File
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2021.04.26";
version = "2021.05.16";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "0jpa65jr5djn9175p6a8j9i1zgarshfwfsgmprc0vvnsl3s23ksc";
sha256 = "1z8sdzvkxhscnzy7cnjag308glif0k8jylr11biqwzypm1f2l0fl";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
pkgs/tools/misc/yubikey-manager-qt/default.nix
+30 -22
View File
@@ -1,53 +1,61 @@
{ lib
, stdenv
, mkDerivation
, fetchurl
, wrapQtAppsHook
, pcsclite
, pyotherside
, pythonPackages
, python3
, qmake
, qtbase
, qtgraphicaleffects
, qtquickcontrols
, qtquickcontrols2
, yubikey-manager
, yubikey-personalization
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "yubikey-manager-qt";
version = "1.1.5";
version = "1.2.2";
src = fetchurl {
url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
sha256 = "1yimlaqvhq34gw6wkqgil0qq8x9zbfzh4psqihjr2d9jaa2wygwy";
sha256 = "1jqibv7na9h2r8nxgzp40j9qpyiwx97c65krivkcqjwdjk5lrahl";
};
nativeBuildInputs = [ wrapQtAppsHook python3.pkgs.wrapPython qmake ];
nativeBuildInputs = [
python3.pkgs.wrapPython
qmake
];
postPatch = ''
substituteInPlace ykman-gui/deployment.pri --replace '/usr/bin' "$out/bin"
'';
buildInputs = [ pythonPackages.python qtbase qtgraphicaleffects qtquickcontrols qtquickcontrols2 pyotherside ];
buildInputs = [
pyotherside
python3
qtbase
qtgraphicaleffects
qtquickcontrols2
];
pythonPath = [ yubikey-manager ];
pythonPath = [
(yubikey-manager.override { python3Packages = python3.pkgs; })
];
dontWrapQtApps = true;
postInstall = ''
buildPythonPath "$pythonPath"
wrapQtApp $out/bin/ykman-gui \
--prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \
--prefix PYTHONPATH : "$program_PYTHONPATH"
mkdir -p $out/share/applications
cp resources/ykman-gui.desktop $out/share/applications/ykman-gui.desktop
mkdir -p $out/share/ykman-gui/icons
cp resources/icons/*.{icns,ico,png,xpm} $out/share/ykman-gui/icons
install -Dt $out/share/applications resources/ykman-gui.desktop
install -Dt $out/share/ykman-gui/icons resources/icons/*.{icns,ico,png,xpm}
substituteInPlace $out/share/applications/ykman-gui.desktop \
--replace 'Exec=ykman-gui' "Exec=$out/bin/ykman-gui" \
--replace 'Exec=ykman-gui' "Exec=$out/bin/ykman-gui"
'';
qtWrapperArgs = [
"--prefix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ pcsclite yubikey-personalization ])
];
preFixup = ''
buildPythonPath "$pythonPath"
qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
'';
meta = with lib; {