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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Vladimír Čunát
2018-11-26 10:28:00 +01:00
parent e41154d1ab 4fef4fbb4b
commit a5de78b7d7
198 changed files with 2486 additions and 1200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
pkgs/development/tools/fusee-launcher/default.nix Normal file
View File

@@ -0,0 +1,43 @@
{ stdenv
, lib
, python3Packages
, python3
, fetchFromGitHub
, pkgsCross
, makeWrapper
} :
stdenv.mkDerivation rec {
name = "fusee-launcher-${version}";
version = "unstable-2018-07-14";
src = fetchFromGitHub {
owner = "Cease-and-DeSwitch";
repo = "fusee-launcher";
rev = "265e8f3e1987751ec41db6f1946d132b296aba43";
sha256 = "1pqkgw5bk0xcz9x7pc1f0r0b9nsc8jnnvcs1315d8ml8mx23fshm";
};
installPhase = ''
mkdir -p $out/bin $out/share
cp fusee-launcher.py $out/bin/fusee-launcher
cp intermezzo.bin $out/share/intermezzo.bin
# Wrap with path to intermezzo.bin relocator binary in /share
wrapProgram $out/bin/fusee-launcher \
--add-flags "--relocator $out/share/intermezzo.bin" \
--prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
'';
nativeBuildInputs = [ pkgsCross.arm-embedded.buildPackages.gcc makeWrapper python3Packages.wrapPython ];
buildInputs = [ python3 python3Packages.pyusb ];
pythonPath = with python3Packages; [ pyusb ];
meta = with stdenv.lib; {
homepage = https://github.com/Cease-and-DeSwitch/fusee-launcher;
description = "Work-in-progress launcher for one of the Tegra X1 bootROM exploits";
license = licenses.gpl2;
maintainers = with maintainers; [ pneumaticat ];
};
}

6
pkgs/development/tools/heroku/default.nix
View File

@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "heroku-${version}";
version = "7.16.0";
version = "7.18.2";
src = fetchurl {
url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz";
sha256 = "434573b4773ce7ccbb21b43b19529475d941fa7dd219b01b75968b42e6b62abe";
sha256 = "1dplh3bfin1g0wwbkg76z3xsja4zqj350vrzl8jfw7982saxqywh";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;

2
pkgs/development/tools/misc/prelink/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
};
meta = {
homepage = http://people.redhat.com/jakub/prelink/;
homepage = https://people.redhat.com/jakub/prelink/;
license = "GPL";
description = "ELF prelinking utility to speed up dynamic linking";
platforms = stdenv.lib.platforms.linux;

2
pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "http://src.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz";
url = "https://src.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz";
sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13";
};
patchFlags = "-p0";

3
pkgs/development/tools/pew/default.nix
View File

@@ -11,6 +11,8 @@ with python3Packages; buildPythonApplication rec {
propagatedBuildInputs = [ virtualenv virtualenv-clone setuptools ];
LC_ALL = "en_US.UTF-8";
postFixup = ''
set -euo pipefail
PEW_SITE="$out/lib/${python.libPrefix}/site-packages"
@@ -24,6 +26,7 @@ with python3Packages; buildPythonApplication rec {
'';
meta = with stdenv.lib; {
homepage = https://github.com/berdario/pew;
description = "Tools to manage multiple virtualenvs written in pure python";
license = licenses.mit;
platforms = platforms.all;

12
pkgs/development/tools/phantomjs2/default.nix
View File

@@ -37,27 +37,27 @@ in stdenv.mkDerivation rec {
patches = [
(fetchpatch {
url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-hardening.patch?id=42c9154d8c87c9fe434908259b0eddde4d892ca3";
url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-hardening.patch;
sha256 = "1qs1r76w90qgpw742i7lf0y3b7m9zh5wxcbrhrak6mq1kqaphqb5";
})
(fetchpatch {
url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt-components.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3";
url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt-components.patch;
sha256 = "1fw2q59aqcks3abvwkqg9903yif6aivdsznc0h6frhhjvpp19vsb";
})
(fetchpatch {
url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt55-evaluateJavaScript.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3";
url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-evaluateJavaScript.patch;
sha256 = "1avig9cfny8kv3s4mf3mdzvf3xlzgyh351yzwc4bkpnjvzv4fmq6";
})
(fetchpatch {
url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt55-no-websecurity.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3";
url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-no-websecurity.patch;
sha256 = "1nykqpxa7lcf9iarz5lywgg3v3b1h19iwvjdg4kgq0ai6idhcab8";
})
(fetchpatch {
url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt55-print.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3";
url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-print.patch;
sha256 = "1fydmdjxnplglpbd3ypaih5l237jkxjirpdhzz92mcpy29yla6jw";
})
(fetchpatch {
url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/unlock-qt.patch";
url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/unlock-qt.patch;
sha256 = "13bwz4iw17d6hq5pwkbpcckqyw7fhc6648lvs26m39pp31zwyp03";
})
./system-qtbase.patch