b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #153282 from Stunkymonkey/treewide-github-3

Browse source 
treewide: switch to fetchFromGitHub
This commit is contained in:
Bobby Rong 2022-01-03 19:25:09 +08:00 committed by GitHub
parent bd201361f5 9c2ad237b9
commit a8a800ec30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 57 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/libraries/libfaketime/default.nix
View file

@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl, perl, coreutils }:
{ lib, stdenv, fetchFromGitHub, perl, coreutils }:
stdenv.mkDerivation rec {
pname = "libfaketime";
version = "0.9.9";
src = fetchurl {
url = "https://github.com/wolfcw/libfaketime/archive/v${version}.tar.gz";
sha256 = "sha256-V9AYEVA2HAqbXI7vBbETkvYTStosLZmOkuY9rtY5ZHw=";
src = fetchFromGitHub {
owner = "wolfcw";
repo = "libfaketime";
rev = "v${version}";
sha256 = "sha256-P1guVggteGtoq8+eeE966hDPkRwsn0m7oLCohyPrIb4=";
};
patches = [

10
pkgs/development/libraries/libinotify-kqueue/default.nix
View file

@ -1,12 +1,14 @@
{ lib, stdenv, fetchzip, autoreconfHook }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "libinotify-kqueue";
version = "20180201";
src = fetchzip {
url = "https://github.com/libinotify-kqueue/libinotify-kqueue/archive/${version}.tar.gz";
sha256 = "0dkh6n0ghhcl7cjkjmpin118h7al6i4vlkmw57vip5f6ngr6q3pl";
src = fetchFromGitHub {
owner = "libinotify-kqueue";
repo = "libinotify-kqueue";
rev = version;
sha256 = "sha256-9A5s8rPGlRv3KbxOukk0VB2IQrDxVjklO5RB+IA1cDY=";
};
nativeBuildInputs = [ autoreconfHook ];

10
pkgs/development/libraries/libmowgli/default.nix
View file

@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "libmowgli";
version = "2.1.3";
src = fetchurl {
url = "https://github.com/atheme/libmowgli-2/archive/v${version}.tar.gz";
sha256 = "0xx4vndmwz40pxa5gikl8z8cskpdl9a30i2i5fjncqzlp4pspymp";
src = fetchFromGitHub {
owner = "atheme";
repo = "libmowgli-2";
rev = "v${version}";
sha256 = "sha256-jlw6ixMoIdIjmQ86N+KN+Gez218sw894POkcCYnT0s0=";
};
meta = with lib; {

10
pkgs/development/libraries/libmx/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl
{ lib, stdenv, fetchFromGitHub
, libtool, pkg-config, automake, autoconf, intltool
, glib, gobject-introspection, gtk2, gtk-doc
, clutter, clutter-gtk
@ -8,9 +8,11 @@ stdenv.mkDerivation rec {
pname = "libmx";
version = "1.4.7";
src = fetchurl {
url = "https://github.com/clutter-project/mx/archive/${version}.tar.gz";
sha256 = "8a7514ea33c1dec7251d0141e24a702e7701dc9f00348cbcf1816925b7f74dbc";
src = fetchFromGitHub {
owner = "clutter-project";
repo = "mx";
rev = version;
sha256 = "sha256-+heIPSkg3d22xsU48UOTJ9FPLXC7zLivcnabQOM9aEk=";
};
# remove the following superfluous checks

10
pkgs/development/python-modules/pyside/apiextractor.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, python3, qt4 }:
{ lib, stdenv, fetchFromGitHub, cmake, libxml2, libxslt, python3, qt4 }:
# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
let
@ -8,9 +8,11 @@ stdenv.mkDerivation rec {
pname = "pyside-apiextractor";
version = "0.10.10";
src = fetchurl {
url = "https://github.com/PySide/Apiextractor/archive/${version}.tar.gz";
sha256 = "1zj8yrxy08iv1pk38djxw3faimm226w6wmi0gm32w4yczblylwz3";
src = fetchFromGitHub {
owner = "PySide";
repo = "Apiextractor";
rev = version;
sha256 = "sha256-YH8aYyzv59xiIglZbdNgOPnmEQwNE2GmotAFFfFdMlg=";
};
outputs = [ "out" "dev" ];

13
pkgs/development/python-modules/pyside/generatorrunner.nix
View file

@ -1,16 +1,17 @@
{ lib, stdenv, fetchurl, cmake, pysideApiextractor, python3, qt4 }:
{ lib, stdenv, fetchFromGitHub, cmake, pysideApiextractor, python3, qt4 }:
# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
let
pythonEnv = python3.withPackages(ps: with ps; [ sphinx ]);
in stdenv.mkDerivation rec {
pname = "pyside-generatorrunner";
version = "0.6.16";
in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/PySide/Generatorrunner/archive/0.6.16.tar.gz";
sha256 = "0vzk3cp0pfbhd921r8f1xkcz96znla39dhj074k623x9k26lj2sj";
src = fetchFromGitHub {
owner = "PySide";
repo = "Generatorrunner";
rev = version;
sha256 = "sha256-JAghKY033RTD5b2elitzVQbbN3PMmT3BHwpqx8N5EYg=";
};
outputs = [ "out" "dev" ];

9
pkgs/development/tools/continuous-integration/laminar/default.nix
View file

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
, fetchFromGitHub
, cmake
, capnproto
, sqlite
@ -25,9 +26,11 @@ let
in stdenv.mkDerivation rec {
pname = "laminar";
version = "1.1";
src = fetchurl {
url = "https://github.com/ohwgiles/laminar/archive/${version}.tar.gz";
sha256 = "1lzfmfjygmbdr2n1q49kwwffw8frz5y6iczhdz5skwmzwg0chbsf";
src = fetchFromGitHub {
owner = "ohwgiles";
repo = "laminar";
rev = version;
sha256 = "sha256-9JiFO5Vi/NT/o7v/KXZw3/P5s5qQwmQXjrQq+uUXHQk=";
};
patches = [ ./patches/no-network.patch ];
nativeBuildInputs = [ cmake pandoc ];

9
pkgs/games/nxengine-evo/default.nix
View file

@ -1,6 +1,7 @@
{ lib, stdenv
, fetchpatch
, fetchurl
, fetchFromGitHub
, cmake
, libpng
, SDL2
@ -10,9 +11,11 @@
stdenv.mkDerivation rec {
pname = "nxengine-evo";
version = "2.6.4";
src = fetchurl {
url = "https://github.com/nxengine/nxengine-evo/archive/v${version}.tar.gz";
sha256 = "1xir74l0vrzrpyl7sfqfxp083dakbix26hd0arwf2y57w1mbjas8";
src = fetchFromGitHub {
owner = "nxengine";
repo = "nxengine-evo";
rev = "v${version}";
sha256 = "sha256-krK2b1E5JUMxRoEWmb3HZMNSIHfUUGXSpyb4/Zdp+5A=";
};
assets = fetchurl {
url = "https://github.com/nxengine/nxengine-evo/releases/download/v${version}/NXEngine-v${version}-Linux.tar.xz";

12
pkgs/tools/networking/badvpn/default.nix
View file

@ -1,12 +1,16 @@
{ lib, stdenv, fetchurl, cmake, openssl, nss, pkg-config, nspr, bash, debug ? false }:
{ lib, stdenv, fetchFromGitHub, cmake, openssl, nss, pkg-config, nspr, bash, debug ? false }:
stdenv.mkDerivation rec {
pname = "badvpn";
version = "1.999.130";
src = fetchurl {
url = "https://github.com/ambrop72/badvpn/archive/${version}.tar.gz";
sha256 = "sha256-v9S7/r1ydLzseSVYyaL9YOOc2S4EZzglreXQQVR2YQk=";
src = fetchFromGitHub {
owner = "ambrop72";
repo = "badvpn";
rev = version;
sha256 = "sha256-bLTDpq3ohUP+KooPvhv1/AZfdo0HwB3g9QOuE2E/pmY=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
openssl