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

Merge branch 'master' into gcc-7

Browse Source 
Hydra: ?compare=1434487
This commit is contained in:
Vladimír Čunát 2018-02-19 15:24:13 +01:00
commit 0c8939b5fb
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
11 changed files with 164 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/editors/leo-editor/default.nix
View File

@ -1,20 +1,29 @@
{ stdenv, python3Packages, fetchFromGitHub, makeWrapper, makeDesktopItem }:
{ stdenv, python3, libsForQt56, fetchFromGitHub, makeWrapper, makeDesktopItem }:
let
packageOverrides = self: super: {
pyqt56 = libsForQt56.callPackage ../../../development/python-modules/pyqt/5.x.nix {
pythonPackages = self;
};
};
pythonPackages = (python3.override { inherit packageOverrides; }).pkgs;
in
stdenv.mkDerivation rec {
name = "leo-editor-${version}";
version = "5.5";
version = "5.6";
src = fetchFromGitHub {
owner = "leo-editor";
repo = "leo-editor";
rev = version;
sha256 = "0crzljirzfiy9xn02ydd23clmd8bzdjxkyxdqsvdkgfy9j41b8hr";
sha256 = "1k6q3gvaf05bi0mzkmmb1p6wrgxwri7ivn38p6f0m0wfd3f70x2j";
};
dontBuild = true;
nativeBuildInputs = [ makeWrapper python3Packages.python ];
propagatedBuildInputs = with python3Packages; [ pyqt5 ];
nativeBuildInputs = [ makeWrapper python3 ];
propagatedBuildInputs = with pythonPackages; [ pyqt56 docutils ];
desktopItem = makeDesktopItem rec {
name = "leo-editor";
@ -50,7 +59,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/leo-editor
mv * $out/share/leo-editor
makeWrapper ${python3Packages.python.interpreter} $out/bin/leo \
makeWrapper ${python3.interpreter} $out/bin/leo \
--set PYTHONPATH "$PYTHONPATH:$out/share/leo-editor" \
--add-flags "-O $out/share/leo-editor/launchLeo.py"
'';

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -13,7 +13,7 @@
}:
let
version = "2.16.1";
version = "2.16.2";
svn = subversionClient.override { perlBindings = true; };
in
@ -22,7 +22,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "06gay8k29glg4giwphjalcc1fknxw4bmxkmbr3ic3gzxy8vl7bfg";
sha256 = "05y7480f2p7fkncbhf08zz56jbykcp0ia5gl6y3djs0lsa5mfq2m";
};
hardeningDisable = [ "format" ];

31
pkgs/applications/virtualization/qemu/statfs-flags.patch
View File

@ -1,4 +1,4 @@
commit d3282d2512774dc5027c98930a3852b2b6e8407a
commit 909fe47c7009aa9a75fe9470c5f8d3dd5b50917a
Author: Shea Levy <shea@shealevy.com>
Date: Sun Feb 18 13:50:11 2018 -0500
@ -59,7 +59,7 @@ index 82b35a6bdf..77481eca2c 100644
unlock_user_struct(target_stfs, arg2, 1);
}
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index a35c52a60a..9f90451caf 100644
index a35c52a60a..64aa49d3c5 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -362,7 +362,14 @@ struct kernel_statfs {
@ -77,49 +77,46 @@ index a35c52a60a..9f90451caf 100644
};
struct target_dirent {
@@ -2223,7 +2230,13 @@ struct target_statfs {
@@ -2223,7 +2230,12 @@ struct target_statfs {
/* Linux specials */
target_fsid_t f_fsid;
int32_t f_namelen;
+#ifdef HAVE_STATFS_FLAGS
+ int32_t f_frsize;
+ int32_t f_flags;
+ int32_t f_spare[4];
+ int32_t f_spare[5];
+#else
int32_t f_spare[6];
+#endif
};
#else
struct target_statfs {
@@ -2239,7 +2252,13 @@ struct target_statfs {
@@ -2239,7 +2251,12 @@ struct target_statfs {
/* Linux specials */
target_fsid_t f_fsid;
abi_long f_namelen;
+#ifdef HAVE_STATFS_FLAGS
+ abi_long f_frsize;
+ abi_long f_flags;
+ abi_long f_spare[4];
+ abi_long f_spare[5];
+#else
abi_long f_spare[6];
+#endif
};
#endif
@@ -2255,7 +2274,13 @@ struct target_statfs64 {
@@ -2255,7 +2272,12 @@ struct target_statfs64 {
uint64_t f_bavail;
target_fsid_t f_fsid;
uint32_t f_namelen;
+#ifdef HAVE_STATFS_FLAGS
+ uint32_t f_frsize;
+ uint32_t f_flags;
+ uint32_t f_spare[4];
+ uint32_t f_spare[5];
+#else
uint32_t f_spare[6];
+#endif
};
#elif (defined(TARGET_PPC64) || defined(TARGET_X86_64) || \
defined(TARGET_SPARC64) || defined(TARGET_AARCH64)) && \
@@ -2271,7 +2296,12 @@ struct target_statfs {
@@ -2271,7 +2293,12 @@ struct target_statfs {
target_fsid_t f_fsid;
abi_long f_namelen;
abi_long f_frsize;
@ -132,7 +129,7 @@ index a35c52a60a..9f90451caf 100644
};
struct target_statfs64 {
@@ -2285,7 +2315,12 @@ struct target_statfs64 {
@@ -2285,7 +2312,12 @@ struct target_statfs64 {
target_fsid_t f_fsid;
abi_long f_namelen;
abi_long f_frsize;
@ -145,7 +142,7 @@ index a35c52a60a..9f90451caf 100644
};
#elif defined(TARGET_S390X)
struct target_statfs {
@@ -2299,7 +2334,13 @@ struct target_statfs {
@@ -2299,7 +2331,13 @@ struct target_statfs {
kernel_fsid_t f_fsid;
int32_t f_namelen;
int32_t f_frsize;
@ -159,7 +156,7 @@ index a35c52a60a..9f90451caf 100644
};
struct target_statfs64 {
@@ -2313,7 +2354,12 @@ struct target_statfs64 {
@@ -2313,7 +2351,12 @@ struct target_statfs64 {
kernel_fsid_t f_fsid;
int32_t f_namelen;
int32_t f_frsize;
@ -172,7 +169,7 @@ index a35c52a60a..9f90451caf 100644
};
#else
struct target_statfs {
@@ -2327,7 +2373,12 @@ struct target_statfs {
@@ -2327,7 +2370,12 @@ struct target_statfs {
target_fsid_t f_fsid;
uint32_t f_namelen;
uint32_t f_frsize;
@ -185,7 +182,7 @@ index a35c52a60a..9f90451caf 100644
};
struct target_statfs64 {
@@ -2341,7 +2392,12 @@ struct target_statfs64 {
@@ -2341,7 +2389,12 @@ struct target_statfs64 {
target_fsid_t f_fsid;
uint32_t f_namelen;
uint32_t f_frsize;

4
pkgs/data/documentation/zeal/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "zeal-${version}";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "zealdocs";
repo = "zeal";
rev = "v${version}";
sha256 = "14gm9n2zmqgig4nz5i3089dhn0a7c175g1szr0zg9yzr9j2hk0mr";
sha256 = "0zsrb89jz04b8in1d69p7mg001yayyljc47vdlvm48cjbhvxwj0k";
};
# while ads can be disabled from the user settings, by default they are not so

32
pkgs/data/documentation/zeal/remove_ads.patch
View File

@ -1,17 +1,23 @@
commit 1b61397175b6e60f23224db463301c9057830859
Author: Peter Hoeg <peter@hoeg.com>
Date: Mon Feb 19 07:38:03 2018 +0800
strip container with ads
diff --git a/src/app/resources/browser/welcome.html b/src/app/resources/browser/welcome.html
index 22e6278..ec09771 100644
index bb3f511..67382b2 100644
--- a/src/app/resources/browser/welcome.html
+++ b/src/app/resources/browser/welcome.html
@@ -35,12 +35,6 @@
<div class="hero-foot">
<div class="container">
<div class="content has-text-centered">
- <div id="carboncontainer">
- <div id="carbon" class="box">
- <script async type="text/javascript" src="https://cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=zealdocsforwindowsorg"
- onerror="document.getElementById('carboncontainer').style.display = 'none';" id="_carbonads_js"></script>
@@ -20,12 +20,6 @@
<span id="version" class="has-text-weight-light is-size-5"></span>
</p>
<p class="subtitle">Docs for everyone</p>
- <div id="carboncontainer" style="margin-top: 75px;">
- <div id="carbon" class="box">
- <script async type="text/javascript" src="https://cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=zealdocsforwindowsorg"
- onerror="document.getElementById('carboncontainer').style.display = 'none';" id="_carbonads_js"></script>
- </div>
- </div>
- </div>
<p>
<a class="icon" href="https://github.com/zealdocs/zeal">
<i class="fa fa-github"></i>
</div>
<div class="column">
<p class="subtitle is-5">Customize</p>

28
pkgs/development/interpreters/clojure/default.nix
View File

@ -1,28 +1,28 @@
{ stdenv, fetchurl, jdk, rlwrap, makeWrapper }:
let version = "1.9.0.326"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "clojure-${version}";
version = "1.9.0.329";
src = fetchurl {
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "0sf8gy39iz4jxj2wic1lbdwdwbj90k3awhr0kq76gr1z1dwbj6s9";
sha256 = "1g1mi75285z977vrqbihmmmrmdcnznxbw3r6wkzh571sc1yyrlrj";
};
buildInputs = [ makeWrapper ];
outputs = [ "out" "prefix" ];
installPhase = ''
pwd
ls -la
mkdir -p $out/libexec $out/bin
cp -f deps.edn example-deps.edn $out
cp -f clojure-tools-${version}.jar $out/libexec
sed -i -e "s@PREFIX@$out@g" clojure
cp -f clj clojure $out/bin
for program in $out/bin/{clojure,clj}; do
wrapProgram $program --suffix PATH : $out/bin:${jdk.jre}/bin:${rlwrap}/bin
done
mkdir -p $prefix/libexec
cp clojure-tools-${version}.jar $prefix/libexec
cp {,example-}deps.edn $prefix
substituteInPlace clojure --replace PREFIX $prefix
install -Dt $out/bin clj clojure
wrapProgram $out/bin/clj --suffix PATH ${rlwrap}/bin
wrapProgram $out/bin/clojure --suffix PATH ${jdk}/bin
'';
meta = with stdenv.lib; {

48
pkgs/development/tools/analysis/radare2-cutter/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ stdenv, fetchFromGitHub, fetchpatch, qmake, pkgconfig, qtbase, qtsvg, radare2 }:
stdenv.mkDerivation rec {
name = "radare2-cutter-${version}";
version = "1.1";
src = fetchFromGitHub {
owner = "radareorg";
repo = "cutter";
rev = "v${version}";
sha256 = "02m5sf45n455hn34y7hrqanj830rc5xhz2ppp1z3mzbz0s515pfl";
};
postUnpack = "export sourceRoot=$sourceRoot/src";
patches = [
# Fixup version number :D
(fetchpatch {
url = "https://github.com/radareorg/cutter/commit/69506b64600df632afdca8b680baa7d946c78644.patch";
sha256 = "0ks3ixz8bycjcfi26bd0p6z7qaplhq00alw44hsfzpdm4bmr01x0";
})
(fetchpatch {
url = "https://github.com/radareorg/cutter/commit/8b52c66f4f0091cd9d97389b32aa519c2c602e2b.patch";
sha256 = "0wcdn35lx2943pfzm7mkg4sr82pm0qz3yxf74m8fxbd70s3w0gkm";
})
# case-insensitive filtering
(fetchpatch {
url = "https://github.com/radareorg/cutter/commit/0ebd34370bcaed00000168147572bb78106eeab1.patch";
sha256 = "0sc50jwhncfnd2i5mlyld4dbdzi2ws7nh4yglkhlap9l9h1jxn20";
})
];
patchFlags = [ "-p2" ];
nativeBuildInputs = [ qmake pkgconfig ];
buildInputs = [ qtbase qtsvg radare2 ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A Qt and C++ GUI for radare2 reverse engineering framework";
homepage = src.meta.homepage;
license = licenses.gpl3;
maintainers = with maintainers; [ dtzWill ];
};
}

25
pkgs/development/tools/analysis/radare2/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig, libusb, readline, libewf, perl, zlib, openssl,
{stdenv, fetchFromGitHub, fetchgit, fetchurl, fetchpatch, pkgconfig, libusb, readline, libewf, perl, zlib, openssl, git,
gtk2 ? null, vte ? null, gtkdialog ? null,
python ? null,
ruby ? null,
@ -13,32 +13,33 @@ let
inherit (stdenv.lib) optional;
in
stdenv.mkDerivation rec {
version = "2.2.0";
version = "2.3.0";
name = "radare2-${version}";
src = fetchFromGitHub {
owner = "radare";
repo = "radare2";
rev = version;
sha256 = "0rd1dfgwdpn3x1pzi67sw040vxywbg5h6yw0mj317p0p1cvlyihl";
sha256 = "0x5vcprqf0fnj876mdvryfvg7ymbrw1cxrr7a06v0swg7yql1lpw";
};
postPatch = let
cs_ver = "3.0.4"; # version from $sourceRoot/shlr/Makefile
capstone = fetchurl {
url = "https://github.com/aquynh/capstone/archive/${cs_ver}.tar.gz";
sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax";
cs_tip = "bdbc57de63725a98732ddc34b48de96f8ada66f2"; # version from $sourceRoot/shlr/Makefile
capstone = fetchgit {
url = "https://github.com/aquynh/capstone.git";
rev = cs_tip;
sha256 = "1sqxpjf2dlrg87dm9p39p5d1qzahrnfnrjijpv1xg1shax439jni";
leaveDotGit = true;
};
in ''
if ! grep -F "CS_VER=${cs_ver}" shlr/Makefile; then echo "CS_VER mismatch"; exit 1; fi
substituteInPlace shlr/Makefile --replace CS_RELEASE=0 CS_RELEASE=1
cp ${capstone} shlr/capstone-${cs_ver}.tar.gz
if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi
cp -r ${capstone} shlr/capstone
chmod -R u+rw shlr/capstone
'';
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig git ];
buildInputs = [ readline libusb libewf perl zlib openssl]
++ optional useX11 [gtkdialog vte gtk2]
++ optional rubyBindings [ruby]

32
pkgs/misc/riscv-pk/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ stdenv, fetchFromGitHub, autoreconfHook }: let
rev = "e5846a2bc707eaa58dc8ab6a8d20a090c6ee8570";
sha256 = "1clynpp70fnbgsjgxx7xi0vrdrj1v0h8zpv0x26i324kp2gwylf4";
revCount = "438";
shortRev = "e5846a2";
in stdenv.mkDerivation {
name = "riscv-pk-0.1pre${revCount}_${shortRev}";
src = fetchFromGitHub {
owner = "riscv";
repo = "riscv-pk";
inherit rev sha256;
};
nativeBuildInputs = [ autoreconfHook ];
preConfigure = ''
mkdir build
cd build
'';
configureScript = "../configure";
hardeningDisable = [ "all" ];
meta = {
description = "RISC-V Proxy Kernel and Bootloader.";
homepage = https://github.com/riscv/riscv-pk;
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.shlevy ];
};
}

4
pkgs/tools/misc/less/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses, lessSecure ? false }:
stdenv.mkDerivation rec {
name = "less-529";
name = "less-530";
src = fetchurl {
url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz";
sha256 = "02wspzv90cki8936m50qxk0vrribvwwqlva21nyvfx41qga2r96v";
sha256 = "1qpj2z38c53qmvqn8jaa0kq26q989cfbfjj4y0s6z17l1amr2gsh";
};
configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc.

3
pkgs/top-level/all-packages.nix
View File

@ -7920,6 +7920,7 @@ with pkgs;
rubyBindings = config.radare.rubyBindings or false;
luaBindings = config.radare.luaBindings or false;
};
radare2-cutter = libsForQt5.callPackage ../development/tools/analysis/radare2-cutter { };
ragel = ragelStable;
@ -13546,6 +13547,8 @@ with pkgs;
rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { };
riscv-pk = callPackage ../misc/riscv-pk { };
rtkit = callPackage ../os-specific/linux/rtkit { };
rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { };