Merge pull request #153482 from Stunkymonkey/treewide-github-4

treewide: switch to fetchFromGitHub
This commit is contained in:
Bernardo Meurer 2022-01-06 01:40:39 +00:00 committed by GitHub
commit f38e647aed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 26 deletions

View File

@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl, cmake }:
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
version = "2.2.0";
pname = "LASzip";
src = fetchurl {
url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz";
sha256 = "b8e8cc295f764b9d402bc587f3aac67c83ed8b39f1cb686b07c168579c61fbb2";
src = fetchFromGitHub {
owner = "LASzip";
repo = "LASzip";
rev = "v${version}";
sha256 = "sha256-TXzse4oLjNX5R2xDR721iV+gW/rP5z3Zciv4OgxfeqA=";
};
nativeBuildInputs = [ cmake ];

View File

@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl, python3, runCommand, makeWrapper, stress-ng }:
{ lib, stdenv, fetchFromGitHub, python3, runCommand, makeWrapper, stress-ng }:
lib.fix (self: stdenv.mkDerivation rec {
pname = "graphene-hardened-malloc";
version = "8";
src = fetchurl {
url = "https://github.com/GrapheneOS/hardened_malloc/archive/${version}.tar.gz";
sha256 = "0lipyd2pb1bmghkyv9zmg25jwcglj7m281f01zlh3ghz3xlfh0ym";
src = fetchFromGitHub {
owner = "GrapheneOS";
repo = "hardened_malloc";
rev = version;
sha256 = "sha256-+5kJb3hhuFTto7zsIymIXl3tpKUOm3v1DCY4EkAOCgo=";
};
doCheck = true;

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome
, gtk-doc, gtk2, python2Packages, lua, gobject-introspection
}:
@ -8,10 +8,11 @@ in stdenv.mkDerivation rec {
pname = "keybinder";
version = "0.3.0";
src = fetchurl {
name = "${pname}-${version}.tar.gz";
url = "https://github.com/engla/keybinder/archive/v${version}.tar.gz";
sha256 = "0kkplz5snycik5xknwq1s8rnmls3qsp32z09mdpmaacydcw7g3cf";
src = fetchFromGitHub {
owner = "engla";
repo = "keybinder";
rev = "v${version}";
sha256 = "sha256-q/+hqhvXIknT+/5oENcWSr1OuF00kaZlXFUP1fdCMlk=";
};
nativeBuildInputs = [ pkg-config ];

View File

@ -1,13 +1,15 @@
{ lib, stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }:
{ lib, stdenv, autoconf, automake, libtool, m4, fetchFromGitLab, bash, pkg-config, sqlite }:
stdenv.mkDerivation rec {
pname = "libcangjie";
version = "1.4_rev_${rev}";
rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d";
src = fetchurl {
url = "https://github.com/Cangjians/libcangjie/archive/${rev}.tar.gz";
sha256 = "0i5svvcx099fc9hh5dvr3gpb1041v6vn5fnylxy82zjy239114lg";
src = fetchFromGitLab {
owner = "Cangjians";
repo = "libcangjie";
inherit rev;
sha256 = "sha256-R7WqhxciaTxhTiwPp2EUNTOh477gi/Pj3VpMtat5qXw=";
};
nativeBuildInputs = [ pkg-config ];
@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
longDescription = ''
libcangjie is a library implementing the Cangjie input method.
'';
homepage = "http://cangjians.github.io/projects/libcangjie/";
homepage = "https://gitlab.freedesktop.org/cangjie/libcangjie";
license = lib.licenses.lgpl3Plus;
maintainers = [ lib.maintainers.linquize ];

View File

@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }:
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }:
stdenv.mkDerivation rec {
pname = "libcec";
version = "6.0.2";
src = fetchurl {
url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
sha256 = "0xrkrcgfgr5r8r0854bw3i9jbq4jmf8nzc5vrrx2sxzvlkbrc1h9";
src = fetchFromGitHub {
owner = "Pulse-Eight";
repo = "libcec";
rev = "libcec-${version}";
sha256 = "sha256-OWqCn7Z0KG8sLlfMWd0btJIFJs79ET3Y1AV/y/Kj2TU=";
};
nativeBuildInputs = [ pkg-config cmake ];

View File

@ -1,12 +1,14 @@
{ lib, stdenv, fetchzip, autoconf, automake, libtool, libpcap }:
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libpcap }:
stdenv.mkDerivation rec {
pname = "libcrafter";
version = "1.0";
src = fetchzip {
url = "https://github.com/pellegre/libcrafter/archive/version-${version}.zip";
sha256 = "1d2vgxawdwk2zg3scxclxdby1rhghmivly8azdjja89kw7gls9xl";
src = fetchFromGitHub {
owner = "pellegre";
repo = "libcrafter";
rev = "version-${version}";
sha256 = "sha256-tCdN3+EzISVl+wp5umOFD+bgV+uUdabH+2LyxlV/W7Q=";
};
preConfigure = "cd libcrafter";