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

Merge pull request #152297 from Stunkymonkey/treewide-github-2

Browse Source 
treewide: switch to fetchFromGitHub
This commit is contained in:
Dmitry Kalinkin
2022-01-02 11:04:48 -05:00
committed by GitHub
parent 3dffc8babd 70e22061bf
commit 44dc1aedc1
8 changed files with 51 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/audio/libsmf/default.nix
+7 -4
View File
@@ -1,11 +1,14 @@
{ lib, stdenv, fetchurl, autoreconfHook, glib, pkg-config }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, glib, pkg-config }:
stdenv.mkDerivation rec {
version = "1.3";
pname = "libsmf";
src = fetchurl {
url = "https://github.com/stump/libsmf/archive/${pname}-${version}.tar.gz";
sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n";
src = fetchFromGitHub {
owner = "stump";
repo = "libsmf";
rev = "libsmf-${version}";
sha256 = "sha256-OJXJkXvbM2GQNInZXU2ldObquKHhqkdu1zqUDnVZN0Y=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
pkgs/development/libraries/audio/lvtk/default.nix
+6 -4
View File
@@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python2, wafHook }:
{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python2, wafHook }:
stdenv.mkDerivation rec {
pname = "lvtk";
version = "1.2.0";
src = fetchurl {
url = "https://github.com/lvtk/lvtk/archive/${version}.tar.gz";
sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd";
src = fetchFromGitHub {
owner = "lvtk";
repo = "lvtk";
rev = version;
sha256 = "sha256-6IoyhBig3Nvc4Y8F0w8b1up6sn8O2RmoUVaBQ//+Aaw=";
};
nativeBuildInputs = [ pkg-config python2 wafHook ];
pkgs/development/libraries/box2d/default.nix
+8 -6
View File
@@ -1,18 +1,20 @@
{ lib, stdenv, fetchurl, unzip, cmake, libGLU, libGL, freeglut, libX11, xorgproto
{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut, libX11, xorgproto
, libXi, pkg-config }:
stdenv.mkDerivation rec {
pname = "box2d";
version = "2.3.1";
src = fetchurl {
url = "https://github.com/erincatto/box2d/archive/v${version}.tar.gz";
sha256 = "0p03ngsmyz0r5kbpiaq10ns4fxwkjvvawi8k6pfall46b93wizsq";
src = fetchFromGitHub {
owner = "erincatto";
repo = "box2d";
rev = "v${version}";
sha256 = "sha256-Z2J17YMzQNZqABIa5eyJDT7BWfXveymzs+DWsrklPIs=";
};
sourceRoot = "box2d-${version}/Box2D";
sourceRoot = "source/Box2D";
nativeBuildInputs = [ cmake unzip pkg-config ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libGLU libGL freeglut libX11 xorgproto libXi ];
cmakeFlags = [
pkgs/development/libraries/capstone/default.nix
+6 -4
View File
@@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl, pkg-config }:
{ lib, stdenv, fetchFromGitHub, pkg-config }:
stdenv.mkDerivation rec {
pname = "capstone";
version = "4.0.2";
src = fetchurl {
url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz";
sha256 = "0sjjbqps48az4map0kmai7j7dak3gy0xcq0sgx8fg09g0acdg0bw";
src = fetchFromGitHub {
owner = "aquynh";
repo = "capstone";
rev = version;
sha256 = "sha256-XMwQ7UaPC8YYu4yxsE4bbR3leYPfBHu5iixSLz05r3g=";
};
# replace faulty macos detection
pkgs/development/libraries/cmrt/default.nix
+6 -4
View File
@@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libdrm, libva }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libdrm, libva }:
stdenv.mkDerivation rec {
pname = "cmrt";
version = "1.0.6";
src = fetchurl {
url = "https://github.com/intel/cmrt/archive/${version}.tar.gz";
sha256 = "1q7651nvvcqhph5rgfhklm71zqd0c405mrh3wx0cfzvil82yj8na";
src = fetchFromGitHub {
owner = "intel";
repo = "cmrt";
rev = version;
sha256 = "sha256-W6MQI41J9CKeM1eILCkvmW34cbCC8YeEF2mE+Ci8o7s=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
pkgs/development/libraries/grantlee/5/default.nix
+6 -5
View File
@@ -1,14 +1,15 @@
{ mkDerivation, lib, fetchurl, qtbase, qtscript, cmake }:
{ mkDerivation, lib, fetchFromGitHub, qtbase, qtscript, cmake }:
mkDerivation rec {
pname = "grantlee";
version = "5.2.0";
grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}";
src = fetchurl {
url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz";
sha256 = "02lrdbnvaz19hkawbbj2psww1m04qsbhvv172ggpp5bbfkjwx6hk";
name = "${pname}-${version}.tar.gz";
src = fetchFromGitHub {
owner = "steveire";
repo = "grantlee";
rev = "v${version}";
sha256 = "sha256-mAbgzdBdIW1wOTQNBePQuyTgkKdpn1c+zR3H7mXHvgk=";
};
buildInputs = [ qtbase qtscript ];
pkgs/development/libraries/openbabel/2.nix
+6 -4
View File
@@ -1,12 +1,14 @@
{stdenv, lib, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config }:
{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config }:
stdenv.mkDerivation rec {
pname = "openbabel";
version = "2.4.1";
src = fetchurl {
url = "https://github.com/openbabel/openbabel/archive/openbabel-${lib.replaceStrings ["."] ["-"] version}.tar.gz";
sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r";
src = fetchFromGitHub {
owner = "openbabel";
repo = "openbabel";
rev = "openbabel-${lib.replaceStrings ["."] ["-"] version}";
sha256 = "sha256-+pXsWMzex7rB1mm6dnTHzAcyw9jImgx1OZuLeCvbeJ0=";
};
patches = [
pkgs/development/libraries/wxwidgets/3.0/mac.nix
+6 -4
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib
{ lib, stdenv, fetchFromGitHub, expat, libiconv, libjpeg, libpng, libtiff, zlib
# darwin only attributes
, derez, rez, setfile
, AGL, Cocoa, Kernel, WebKit
@@ -8,9 +8,11 @@ stdenv.mkDerivation rec {
version = "3.0.5.1";
pname = "wxmac";
src = fetchzip {
url = "https://github.com/wxWidgets/wxWidgets/archive/v${version}.tar.gz";
sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1";
src = fetchFromGitHub {
owner = "wxWidgets";
repo = "wxWidgets";
rev = "v${version}";
sha256 = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0=";
};
buildInputs = [