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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2018-06-30 01:41:59 +02:00
parent 3892a3e5a9 2059bf9e39
commit f7781f5293
998 changed files with 16512 additions and 10378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "babeltrace-1.5.5";
src = fetchurl {
url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2";
url = "https://www.efficios.com/files/babeltrace/${name}.tar.bz2";
sha256 = "1b78fam1gbsalga5pppn8ka461q35a9svz3mlbv82ssakdw4d4a0";
};

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

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "0.7.0";
src = fetchurl {
url = "http://cgdb.me/files/${name}.tar.gz";
url = "https://cgdb.me/files/${name}.tar.gz";
sha256 = "08slzg3702v5nivjhdx2bciqxc5vqcn8pc4i4lsgkcwdcrj94ymz";
};

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

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
version = "2.7.0";
src = fetchurl {
url = "http://embed.cs.utah.edu/creduce/${name}.tar.gz";
url = "https://embed.cs.utah.edu/creduce/${name}.tar.gz";
sha256 = "0h8s4d54q6cl6i45x3143l2xmr29b2yhr3m0n5qqx63sr5csip1n";
};

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

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "2.3.0";
src = fetchurl {
url = "http://embed.cs.utah.edu/csmith/${name}.tar.gz";
url = "https://embed.cs.utah.edu/csmith/${name}.tar.gz";
sha256 = "1mb5zgixsyf86slggs756k8a5ddmj980md3ic9sa1y75xl5cqizj";
};

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

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "eggdbus-0.6";
src = fetchurl {
url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
url = "https://hal.freedesktop.org/releases/${name}.tar.gz";
sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4";
};

2
pkgs/development/tools/misc/intel-gpu-tools/default.nix
View File

@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
name = "intel-gpu-tools-1.22";
src = fetchurl {
url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.xz";
url = "https://xorg.freedesktop.org/archive/individual/app/${name}.tar.xz";
sha256 = "0p4swf9577p6hzglw1lh2sz63wjkk37b7691saj2qw8ha7fc2rix";
};

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

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "jscoverage-0.5.1";
src = fetchurl {
url = "http://siliconforks.com/jscoverage/download/${name}.tar.bz2";
url = "https://siliconforks.com/jscoverage/download/${name}.tar.bz2";
sha256 = "c45f051cec18c10352f15f9844f47e37e8d121d5fd16680e2dd0f3b4420eb7f4";
};

4
pkgs/development/tools/misc/lit/default.nix
View File

@@ -2,11 +2,11 @@
python2.pkgs.buildPythonApplication rec {
pname = "lit";
version = "0.5.1";
version = "0.6.0";
src = python2.pkgs.fetchPypi {
inherit pname version;
sha256 = "0z651m3vkbk85y41larnsjxrszkbi58x9gzml3lb6ga7qwcrsg97";
sha256 = "1png3jgbhrw8a602gy6rnzvjcrj8w2p2kk6szdg9lz42zr090lgb";
};
# Non-standard test suite. Needs custom checkPhase.

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

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
name = "msitools-${version}";
src = fetchurl {
url = "http://ftp.gnome.org/pub/GNOME/sources/msitools/0.97/${name}.tar.xz";
url = "https://ftp.gnome.org/pub/GNOME/sources/msitools/0.97/${name}.tar.xz";
sha256 = "0pn6izlgwi4ngpk9jk2n38gcjjpk29nm15aad89bg9z3k9n2hnrs";
};

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

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "patchelf-0.9";
src = fetchurl {
url = "http://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83";
};

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

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
url = "http://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2";
url = "https://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2";
sha256 = "1w20f6ilqrz8ca51qhrn1n13h7q1r34k09g33d6l2vwvbrhcffb3";
};

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

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check";
meta = with stdenv.lib; {
homepage = http://strace.io/;
homepage = https://strace.io/;
description = "A system call tracer for Linux";
license = licenses.bsd3;
platforms = platforms.linux;

16
pkgs/development/tools/misc/uhd/default.nix
View File

@@ -9,17 +9,15 @@
let
uhdVer = "v" + version;
ImgVer = "uhd-images_3.11.0.git-227-g9277fc58.tar.xz";
# UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
# and xxx.yyy.zzz. Hrmpf... style keeps changing
version = "3.11.0.0";
version = "3.12.0.0";
# Firmware images are downloaded (pre-built) from:
# http://files.ettus.com/binaries/images/
# Firmware images are downloaded (pre-built) from the respective release on Github
uhdImagesSrc = fetchurl {
url = "http://files.ettus.com/binaries/images/${ImgVer}";
sha256 = "1z8isnlxc5h0168jjpdvdv7rkd55x4dkfh14m8pc501zsf8azd6z";
url = "https://github.com/EttusResearch/uhd/releases/download/${uhdVer}/uhd-images_${version}.tar.xz";
sha256 = "1glf2qay4asajbl92fy432idqk0sj5h603najr8sgkbdyyyr933p";
};
in stdenv.mkDerivation {
@@ -29,7 +27,7 @@ in stdenv.mkDerivation {
owner = "EttusResearch";
repo = "uhd";
rev = "${uhdVer}";
sha256 = "1ilx1a8k5zygfq7acm9yk2fi368b1a1l7ll21kmmxjv6ifz8ds5q";
sha256 = "0m7vw7dmvn7d01kkzphayzi0bk50m5v9a17rpnxhn0bqhw282ksv";
};
enableParallelBuilding = true;
@@ -49,8 +47,10 @@ in stdenv.mkDerivation {
postPhases = [ "installFirmware" ];
# UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images`
installFirmware = ''
tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out"
mkdir -p "$out/share/uhd/images"
tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out/share/uhd/images"
'';
meta = with stdenv.lib; {