Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1523028
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "8.20";
|
||||
version = "8.21";
|
||||
name = "checkstyle-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
|
||||
sha256 = "1vsszdmdpyjdwlc9qqw4m8s6rw3pkdrczrmlmydwqmzvzr559nyp";
|
||||
sha256 = "1jd6kbfmvgr3mr8kjhhr1fj1i3j36ysnfi14g5027ngwbq7klm7d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://checkstyle.sourceforge.net/;
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
platforms = with platforms; linux;
|
||||
platforms = jre.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.99.0";
|
||||
version = "0.100.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "0afm3mz2b4aivqm3hbp6kc7d7a5v89r13x7dahzhf7l21qjv3mz5";
|
||||
sha256 = "10i2r0w979lhqgkq25s1a7j5vxlnjmr2w7nknhc1cvfp3z17k9ay";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
||||
git
|
||||
];
|
||||
|
||||
cargoSha256 = "02k21mh0jyc6vz52jx1qijsfk07pkdv1g2hqx7gyvmm4v10vbfna";
|
||||
cargoSha256 = "1fsxd7yzb38h1d52yyz7kj1v0riycjydb1b1bn1zkhgwm5sm2kbs";
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
{ stdenv, python3, fetchFromGitHub }:
|
||||
|
||||
with python3.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "uefi-firmware-parser";
|
||||
version = "1.8";
|
||||
|
||||
# Version 1.8 is not published on pypi
|
||||
src = fetchFromGitHub {
|
||||
owner = "theopolis";
|
||||
repo = "uefi-firmware-parser";
|
||||
rev = "v${version}";
|
||||
sha256 = "1yn9vi91j1yxkn0icdnjhgl0qrqqkzyhccj39af4f19q1gdw995l";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/theopolis/uefi-firmware-parser/";
|
||||
description = "Parse BIOS/Intel ME/UEFI firmware related structures: Volumes, FileSystems, Files, etc";
|
||||
# MIT + license headers in some files
|
||||
license = with licenses; [
|
||||
mit
|
||||
zlib # uefi_firmware/me.py
|
||||
bsd2 # uefi_firmware/compression/Tiano/**/*
|
||||
publicDomain # uefi_firmware/compression/LZMA/SDK/C/*
|
||||
];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
maintainers = [ maintainers.samueldr ];
|
||||
};
|
||||
}
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "buck";
|
||||
version = "2019.05.06.01";
|
||||
version = "2019.05.22.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0bcj1g8hmcpdgz3c2sxglxxq1jn1x0p9dk6hml8ajkn4h82kw12y";
|
||||
sha256 = "1fxprw18kd3cw1lzv4xi1lnbdni06hs4vm9yh0w548rsfn3wnmxq";
|
||||
};
|
||||
|
||||
patches = [ ./pex-mtime.patch ];
|
||||
|
||||
@@ -77,6 +77,11 @@ in newPython.pkgs.buildPythonApplication rec {
|
||||
mkdir -p "$HOME"
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace conans/requirements_server.txt \
|
||||
--replace "pluginbase>=0.5, < 1.0" "pluginbase>=0.5"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://conan.io;
|
||||
description = "Decentralized and portable C/C++ package manager";
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mill-${version}";
|
||||
version = "0.3.6";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}";
|
||||
sha256 = "1dal08l96a5w8g27vxpsykbwcpfbna4prxqvqk89n0y9jn9s44l1";
|
||||
sha256 = "745756498e5a67c55277534c62959c6fdfa382cda2c1a6e34ef0ea6b49c90880";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
runHook preInstall
|
||||
install -Dm555 "$src" "$out/bin/.mill-wrapped"
|
||||
# can't use wrapProgram because it sets --argv0
|
||||
makeWrapper "$out/bin/.mill-wrapped" "$out/bin/mill" --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]}
|
||||
makeWrapper "$out/bin/.mill-wrapped" "$out/bin/mill" --set JAVA_HOME "${jre}"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "1qbi3z4x39il07xlhfvq5ckzjqrf0yf6p8qidf24fp92gb940zxr";
|
||||
};
|
||||
|
||||
cargoSha256 = "16wzgyn3k0yn70y0ciliyx1sjgppmkv9b4bn9p4x0qi6l0ah7fdp";
|
||||
cargoSha256 = "1ysp8y0s0ha5gffwkra2vd1qh5wmfy1678k9hsfals0ww2f79wii";
|
||||
|
||||
nativeBuildInputs = [ openssl perl pkgconfig ];
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
|
||||
|
||||
@@ -13,7 +13,7 @@ buildRustPackage rec {
|
||||
sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z";
|
||||
};
|
||||
|
||||
cargoSha256 = "1pi8fh6vz6m5hr38wm0v0hxp1yxm1ma8yzish3b78zkv8f90kmv0";
|
||||
cargoSha256 = "1i1aq7bwkx8sqrlpxq24ldh908j72lwi2r3sg9zaz5p8xq1xgq6p";
|
||||
|
||||
meta = {
|
||||
description = "Generate changelogs from local git metadata";
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "coursier-${version}";
|
||||
version = "1.1.0-M14-4";
|
||||
version = "1.1.0-M14-6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
|
||||
sha256 = "1rlfqqlinbf472j7ifb8k4zkk2cx543cgnr0hi32qmqmzi0f89r2";
|
||||
sha256 = "01q0gz4qnwvnd7mprcm5aj77hrxyr6ax8jp4d9jkqfkg272znaj7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "17pd090wpnx7i8q9pp9rhps35ahm1xn4h6pm1cfsafm072qd7rff";
|
||||
};
|
||||
|
||||
cargoSha256 = "1hsnz4sj8kff9azcbw9pkr2ipxlymz4zcm4vhfwydfkdlvdncpxm";
|
||||
cargoSha256 = "0a2d2qnb0wkxcs2l839p7jsr99ng2frahsfi2viy9fjynsjpvzlm";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Markdown shell pre-processor";
|
||||
|
||||
@@ -20,7 +20,7 @@ buildRustPackage rec {
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
|
||||
cargoSha256 = "1a8idl6falz0n9irh1p8hv5w2pmiknzsfnxl70k1psnznrpk2y8n";
|
||||
cargoSha256 = "1pwg35kgn5z2zrlj1dwcbbdmkgmnvfxpxv4klzsxxg4m9xr1pfy4";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers";
|
||||
|
||||
@@ -13,7 +13,7 @@ buildRustPackage rec {
|
||||
sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014";
|
||||
};
|
||||
|
||||
cargoSha256 = "06w864f73kijq24xzljfaf47d97aqyg4md3crzbq8hns157m3sv2";
|
||||
cargoSha256 = "07b25pcndhwvpwa5khdh8y1fl44hdv6ff2pfj1mjc0wchbspqm6q";
|
||||
|
||||
cargoDepsHook = ''
|
||||
(
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ccls-${version}";
|
||||
version = "0.20190301";
|
||||
version = "0.20190314.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MaskRay";
|
||||
repo = "ccls";
|
||||
rev = version;
|
||||
sha256 = "1n60mly993czq3mnb82k8yqjrbfnsnx5v5dmr8ylqif3awcsk04i";
|
||||
sha256 = "1yvxliryqx2bc7r6ri4iafbrjx19jk8hnfbvq5xla72q0gqb97lf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
@@ -18,9 +18,12 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlags = [
|
||||
"-DSYSTEM_CLANG=ON"
|
||||
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12"
|
||||
"-DCMAKE_CXX_FLAGS=-fvisibility=hidden"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
cmakeFlagsArray+=(-DCMAKE_CXX_FLAGS="-fvisibility=hidden -fno-rtti")
|
||||
'';
|
||||
|
||||
shell = runtimeShell;
|
||||
postFixup = ''
|
||||
# We need to tell ccls where to find the standard library headers.
|
||||
|
||||
@@ -13,12 +13,6 @@ if lib.versions.major nix.version == "1"
|
||||
else
|
||||
|
||||
let
|
||||
isGreaterNix20 = with lib.versions;
|
||||
let
|
||||
inherit (nix) version;
|
||||
inherit (lib) toInt;
|
||||
in major version == "2" && toInt (minor version) >= 1 || toInt (major version) > 2;
|
||||
|
||||
perlDeps = buildEnv {
|
||||
name = "hydra-perl-deps";
|
||||
paths = with perlPackages;
|
||||
@@ -74,16 +68,16 @@ let
|
||||
];
|
||||
};
|
||||
in releaseTools.nixBuild rec {
|
||||
name = "hydra-${version}";
|
||||
version = "2019-03-18";
|
||||
pname = "hydra";
|
||||
version = "2019-05-06";
|
||||
|
||||
inherit stdenv;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "hydra";
|
||||
rev = "0721f6623ffb5a4b6a77b499af4eee7d6e4dd6a7";
|
||||
sha256 = "0b2g2bnbaqpwxx8p81i4gpl4y16i57z5pnjm90fpd0jxnkij3pcg";
|
||||
repo = pname;
|
||||
rev = "ff64583d07f046e378a6be596ec0ce7a9e2b7472";
|
||||
sha256 = "0w88q0saz7si22z3ryim6vdrv9qkwn6l25xfmiapvh5qrnrrdcb9";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
@@ -93,7 +87,8 @@ in releaseTools.nixBuild rec {
|
||||
perlDeps perl nix
|
||||
postgresql # for running the tests
|
||||
nlohmann_json
|
||||
] ++ lib.optionals isGreaterNix20 [ boost ];
|
||||
boost
|
||||
];
|
||||
|
||||
hydraPath = lib.makeBinPath (
|
||||
[ sqlite subversion openssh nix coreutils findutils pixz
|
||||
@@ -102,15 +97,7 @@ in releaseTools.nixBuild rec {
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
# adds a patch which ensures compatibility with the API of Nix 2.0.
|
||||
# it has been reverted in https://github.com/NixOS/hydra/commit/162d671c48a418bd10a8a171ca36787ef3695a44,
|
||||
# for Nix 2.1/unstable compatibility. Reapplying helps if Nix 2.0 is used to keep the build functional.
|
||||
patches = lib.optionals (!isGreaterNix20) [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/NixOS/hydra/commit/08de434bdd0b0a22abc2081be6064a6c846d3920.patch";
|
||||
sha256 = "0kz77njp5ynn9l81g3q8zrryvnsr06nk3iw0a60187wxqzf5fmf8";
|
||||
})
|
||||
] ++ [
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/NixOS/hydra/pull/648/commits/4171ab4c4fd576c516dc03ba64d1c7945f769af0.patch";
|
||||
sha256 = "1fxa2459kdws6qc419dv4084c1ssmys7kqg4ic7n643kybamsgrx";
|
||||
|
||||
43
pkgs/development/tools/misc/igprof/default.nix
Normal file
43
pkgs/development/tools/misc/igprof/default.nix
Normal file
@@ -0,0 +1,43 @@
|
||||
{stdenv, fetchFromGitHub, libunwind, cmake, pcre, gdb}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.9.16";
|
||||
name = "igprof-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "igprof";
|
||||
repo = "igprof";
|
||||
rev = "v${version}";
|
||||
sha256 = "0rx3mv8zdh9bmcpfbzkib3d52skzfr8600gh5gv21wcsh50jnifx";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/igprof --replace libigprof.so $out/lib/libigprof.so
|
||||
'';
|
||||
|
||||
buildInputs = [libunwind gdb pcre];
|
||||
nativeBuildInputs = [cmake];
|
||||
CXXFLAGS = ["-fPIC" "-O2" "-w" "-fpermissive"];
|
||||
|
||||
meta = {
|
||||
description = "The Ignominous Profiler";
|
||||
|
||||
longDescription = ''
|
||||
IgProf is a fast and light weight profiler. It correctly handles
|
||||
dynamically loaded shared libraries, threads and sub-processes started by
|
||||
the application. We have used it routinely with large C++ applications
|
||||
consisting of many hundreds of shared libraries and thousands of symbols
|
||||
from millions of source lines of code. It requires no special privileges
|
||||
to run. The performance reports provide full navigable call stacks and
|
||||
can be customised by applying filters. Results from any number of
|
||||
profiling runs can be included. This means you can both dig into the
|
||||
details and see the big picture from combined workloads.
|
||||
'';
|
||||
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
|
||||
homepage = https://igprof.org/;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ ktf ];
|
||||
};
|
||||
}
|
||||
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "0gz8m5j9p7hwylyl7cdxbli9rpy1p6lsrbym4zk647819pg4k1jp";
|
||||
};
|
||||
|
||||
cargoSha256 = "1xai3jxvs8r3s3v5d5w40miw6nihnj9gzlzzdrwphmgrkywr88c4";
|
||||
cargoSha256 = "19h0ybi9qq5shvr7zix0gb24a29lqkvyfc5xbgps8wqgfrhx4nqa";
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [
|
||||
libiconv darwin.apple_sdk.frameworks.Security
|
||||
|
||||
@@ -36,5 +36,5 @@ buildRustPackage rec {
|
||||
cp ${cargo-lock} $out/Cargo.lock
|
||||
'';
|
||||
|
||||
cargoSha256 = "0sdk090sp89vgwz5a71f481a5sk13kcqb29cx1dslfq59sp4j6y7";
|
||||
cargoSha256 = "132a9vnlyp78zxiw5xrazadvx0scs7h2vbm5wz612dmh436mwnxg";
|
||||
}
|
||||
|
||||
@@ -1,94 +0,0 @@
|
||||
From c6d02dba2911d93e2379cfb5e550b93558dd51bf Mon Sep 17 00:00:00 2001
|
||||
From: Greg Nietsky <gregory@distrotech.co.za>
|
||||
Date: Tue, 4 Mar 2014 11:33:40 +0200
|
||||
Subject: [PATCH] Fix: Allow qt-creator to build on arm aarch32 and aarch64
|
||||
|
||||
Botan is imported hardwired for x86 this small patch allows it
|
||||
too operate on arm other platforms could be added.
|
||||
|
||||
Task-number: QTCREATORBUG-8107
|
||||
Change-Id: Iddea28f21c9fa1afd2fdd5d16a44e6c96a516a7a
|
||||
---
|
||||
src/libs/3rdparty/botan/botan.cpp | 16 +++++++++++++++-
|
||||
src/libs/3rdparty/botan/botan.h | 2 ++
|
||||
2 files changed, 17 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp
|
||||
index 917c385..4364a2e 100644
|
||||
--- a/src/libs/3rdparty/botan/botan.cpp
|
||||
+++ b/src/libs/3rdparty/botan/botan.cpp
|
||||
@@ -1101,6 +1101,8 @@ class Montgomery_Exponentiator : public Modular_Exponentiator
|
||||
|
||||
#if (BOTAN_MP_WORD_BITS != 32)
|
||||
#error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32
|
||||
+#elif !defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
|
||||
+typedef Botan::u64bit dword;
|
||||
#endif
|
||||
|
||||
#ifdef Q_OS_UNIX
|
||||
@@ -1118,6 +1120,7 @@ extern "C" {
|
||||
*/
|
||||
inline word word_madd2(word a, word b, word* c)
|
||||
{
|
||||
+#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
|
||||
asm(
|
||||
ASM("mull %[b]")
|
||||
ASM("addl %[c],%[a]")
|
||||
@@ -1127,6 +1130,11 @@ inline word word_madd2(word a, word b, word* c)
|
||||
: "0"(a), "1"(b), [c]"g"(*c) : "cc");
|
||||
|
||||
return a;
|
||||
+#else
|
||||
+ dword z = (dword)a * b + *c;
|
||||
+ *c = (word)(z >> BOTAN_MP_WORD_BITS);
|
||||
+ return (word)z;
|
||||
+#endif
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1134,6 +1142,7 @@ inline word word_madd2(word a, word b, word* c)
|
||||
*/
|
||||
inline word word_madd3(word a, word b, word c, word* d)
|
||||
{
|
||||
+#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
|
||||
asm(
|
||||
ASM("mull %[b]")
|
||||
|
||||
@@ -1147,6 +1156,11 @@ inline word word_madd3(word a, word b, word c, word* d)
|
||||
: "0"(a), "1"(b), [c]"g"(c), [d]"g"(*d) : "cc");
|
||||
|
||||
return a;
|
||||
+#else
|
||||
+ dword z = (dword)a * b + c + *d;
|
||||
+ *d = (word)(z >> BOTAN_MP_WORD_BITS);
|
||||
+ return (word)z;
|
||||
+#endif
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2315,7 +2329,7 @@ namespace Botan {
|
||||
|
||||
extern "C" {
|
||||
|
||||
-#ifdef Q_OS_UNIX
|
||||
+#if defined(Q_OS_UNIX) && defined(BOTAN_TARGET_CPU_IS_X86_FAMILY)
|
||||
/*
|
||||
* Helper Macros for x86 Assembly
|
||||
*/
|
||||
diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h
|
||||
index 6a9cbe0..3bfdbc2 100644
|
||||
--- a/src/libs/3rdparty/botan/botan.h
|
||||
+++ b/src/libs/3rdparty/botan/botan.h
|
||||
@@ -81,7 +81,9 @@
|
||||
#endif
|
||||
|
||||
#define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN
|
||||
+#if !defined(__arm__) && !defined(__aarch64__)
|
||||
#define BOTAN_TARGET_CPU_IS_X86_FAMILY
|
||||
+#endif
|
||||
#define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1
|
||||
|
||||
#if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) || \
|
||||
--
|
||||
2.3.0
|
||||
|
||||
@@ -6,25 +6,23 @@
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
baseVersion = "4.6";
|
||||
revision = "2";
|
||||
baseVersion = "4.9";
|
||||
revision = "1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qtcreator-${version}";
|
||||
pname = "qtcreator";
|
||||
version = "${baseVersion}.${revision}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz";
|
||||
sha256 = "1k23i1qsw6d06sy7g0vd699rbvwv6vbw211fy0nn0705a5zndbxv";
|
||||
url = "http://download.qt-project.org/official_releases/${pname}/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz";
|
||||
sha256 = "10ddp1365rf0z4bs7yzc9hajisp3j6mzjshyd0vpi4ki126j5f3r";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
|
||||
|
||||
nativeBuildInputs = [ qmake makeWrapper ];
|
||||
|
||||
patches = optional (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) ./0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -13,7 +13,7 @@ buildRustPackage rec {
|
||||
sha256 = "066f6sdy0vrp113wlg18q9p0clyrg9iqbj17ly0yn8dxr5iar002";
|
||||
};
|
||||
|
||||
cargoSha256 = "0c4awm1d87b396d3g3mp1md5p92i5a64a9jdawpr8mwjd0bly05m";
|
||||
cargoSha256 = "1n92d82l9wqrpsbkqiir6zsgf12xp4xb6bxq2nywg4lmwrnyapbh";
|
||||
|
||||
buildInputs = [ llvmPackages.clang-unwrapped v8 ];
|
||||
|
||||
|
||||
@@ -7,15 +7,15 @@ GEM
|
||||
parser (2.6.3.0)
|
||||
ast (~> 2.4.0)
|
||||
rainbow (3.0.0)
|
||||
rubocop (0.68.1)
|
||||
rubocop (0.71.0)
|
||||
jaro_winkler (~> 1.5.1)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 2.5, != 2.5.1.1)
|
||||
parser (>= 2.6)
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 1.4.0, < 1.6)
|
||||
ruby-progressbar (1.10.0)
|
||||
unicode-display_width (1.5.0)
|
||||
unicode-display_width (>= 1.4.0, < 1.7)
|
||||
ruby-progressbar (1.10.1)
|
||||
unicode-display_width (1.6.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
@@ -56,29 +56,29 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1m1r78w1a4fs73j0x93cv7sms098x24vfp926l5p0nb4vxyhp0xg";
|
||||
sha256 = "0mjyrf1dmf58i40izs8rp2j4mqnyd4qpah9svmkwhs33ckxsjh6b";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.68.1";
|
||||
version = "0.71.0";
|
||||
};
|
||||
ruby-progressbar = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk";
|
||||
sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
};
|
||||
unicode-display_width = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ssnc6rja9ii97z7m35y4zd0rd7cpv3bija20l7cpd7y4jyyx44q";
|
||||
sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
};
|
||||
}
|
||||
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
|
||||
cp ${cargo-lock} $out/Cargo.lock
|
||||
'';
|
||||
|
||||
cargoSha256 = "0ajm8qp8hi7kn7199ywv26cmjv13phxv72lz8kcq97hxg17x0dkk";
|
||||
cargoSha256 = "19kldw2sx0jd89q5q9cwmdcaan148s45fxlb2m0vdxwb69crb7yp";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Command line helpers for fuzzing";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-xbuild";
|
||||
version = "0.5.9";
|
||||
version = "0.5.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-osdev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0c4gls25vvkh4hw8apic03zb54m1v69n9ycwcp49c73ky8lrn0vj";
|
||||
sha256 = "04vgb443bmrfklvzhjfidpi3pp2svbc3bwq674m9fn7sbdp6rnwm";
|
||||
};
|
||||
|
||||
cargoSha256 = "1r9i79lymfwpbcx2lp509v435qpkl9bqly1ya369p41n5yprrcjv";
|
||||
|
||||
@@ -14,7 +14,7 @@ in rustPlatform.buildRustPackage rec {
|
||||
sha256 = "0577v8nqjbb7l7fqvac706bg9zrcp8fbh9ca1mkj44db12v02kgb";
|
||||
};
|
||||
|
||||
cargoSha256 = "1xrzz8c2pfb70i7ynv5lw0d89r284kvhkgjh8z8pgyk1j79ixv2v";
|
||||
cargoSha256 = "1prwgkgvg11cbpx086irrafg59mfvnykadagcp3qgyry6d82blsv";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "0kgax74qa09axq7b175ph3psprgidwgsml83wm1qwdq16gpxiaif";
|
||||
};
|
||||
|
||||
cargoSha256 = "1j3fviimdxn6xa75z0l9wkgdnznp8q20jjs42mql6ql782dga5lk";
|
||||
cargoSha256 = "119xfkglpfq26bz411rjj31i088vr0847p571cxph5v3dfxbgz4y";
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ buildRustPackage rec {
|
||||
|
||||
doCheck = false;
|
||||
|
||||
cargoSha256 = "00gxj98zdkbrc5cxd4w5hk7iwv9a1kwa535hhspx9xd02r4d8rzl";
|
||||
cargoSha256 = "0rxr8l5fhryxqf141sb2j4bjxdikj2hd7bnhbicgm35c9f6cir4m";
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ buildRustPackage rec {
|
||||
sha256 = "07vh4g120sx569wkzclq91blkkd7q7z582pl8vz0li1l9ij8md01";
|
||||
};
|
||||
|
||||
cargoSha256 = "14kd25mw6m20blqcr221cclcqxw0j229zxq8hsaay6q7jgv0c7a0";
|
||||
cargoSha256 = "07zsj12g4ff0cdb9pwz302vxvajr8g6nl3bpz4vdyi84csfvmahz";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
broken = true;
|
||||
|
||||
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = https://github.com/rust-lang-nursery/rustfmt;
|
||||
license = with licenses; [ mit asl20 ];
|
||||
maintainers = [ maintainers.globin ];
|
||||
broken = stdenv.isDarwin;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ buildRustPackage rec {
|
||||
};
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
|
||||
cargoSha256 = "0wsiaa6q9hr9x1cbg6sc8ajg846jjci5qwhdga4d408fmqav72ih";
|
||||
cargoSha256 = "03rfb8swxbcc9qm4mhxz5nm4b1gw7g7389wrdc91abxl4mw733ac";
|
||||
|
||||
# doc tests fail due to missing dependency
|
||||
doCheck = false;
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "skaffold-${version}";
|
||||
version = "0.29.0";
|
||||
# rev is the 0.29.0 commit, mainly for skaffold version command output
|
||||
rev = "1bbf9a3f13094e58c90399a4bd7e07250e0d2da5";
|
||||
version = "0.30.0";
|
||||
# rev is the 0.30.0 commit, mainly for skaffold version command output
|
||||
rev = "fe31429012110e6fd70f97971288bd266ba95bed";
|
||||
|
||||
goPackagePath = "github.com/GoogleContainerTools/skaffold";
|
||||
subPackages = ["cmd/skaffold"];
|
||||
@@ -20,7 +20,7 @@ buildGoPackage rec {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = "skaffold";
|
||||
rev = "v${version}";
|
||||
sha256 = "1rf23f7cwmmsycwdyk09wsrsq20vbzg2pi44r3516qsaz7x98mf1";
|
||||
sha256 = "1vh7vlz14gfjpxf2wy1pybw5x55mw34j6isyy5zl0rsbs9mf6ci1";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "0.1.35";
|
||||
version = "0.1.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "containers";
|
||||
repo = "skopeo";
|
||||
sha256 = "0lp1w8w0jr6x1gnx8lcrc7cqkv3xirrfvan51b7mrzckr9bc45bf";
|
||||
sha256 = "0q0d6dzx9q57fim0drxs7l45500f3228wq50vzj232x5qx5h00sj";
|
||||
};
|
||||
|
||||
defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
json (2.1.0)
|
||||
pg_query (1.0.0)
|
||||
json (>= 1.8, < 3)
|
||||
sqlint (0.1.7)
|
||||
pg_query (~> 0.13.5)
|
||||
pg_query (1.1.0)
|
||||
sqlint (0.1.9)
|
||||
pg_query (~> 1)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
@@ -14,4 +12,4 @@ DEPENDENCIES
|
||||
sqlint
|
||||
|
||||
BUNDLED WITH
|
||||
1.14.6
|
||||
1.17.2
|
||||
|
||||
@@ -1,28 +1,23 @@
|
||||
{
|
||||
json = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
};
|
||||
pg_query = {
|
||||
dependencies = ["json"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0zgwnrf5mkpkxfh49r2pvh2djivrbqd19350g8hxapmkya9w3qpi";
|
||||
sha256 = "070iy9jdj0snfl42my5n6i2svcnn87cbffcjvvq5068hw0b0296w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
};
|
||||
sqlint = {
|
||||
dependencies = ["pg_query"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wm81dgdmgc16b97bz73vm0wjd2m1ra1b40h0kwfd9wgrh9ig2al";
|
||||
sha256 = "1pg9c00w520mw1mzq8kls8whwgqva1alksdsv536bh9nq7m2hnky";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.7";
|
||||
version = "0.1.9";
|
||||
};
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user