git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #166226 from Stunkymonkey/treewide-fetchFromGitHub-3
commitbe561c7d0b5b2ae945c2cd41bd7fa12717dc0849 authorSandro <sandro.jaeckel@gmail.com> dateTue 29 Mar 2022, 16:02 (5 years ago) parent4e6f36c28e5421
10 files changed+54−46
compare with master
unifiedsplit
pkgs/applications/misc/slic3r/default.nix+5−4 pkgs/applications/networking/p2p/twister/default.nix+5−5 pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix+5−4 pkgs/development/compilers/ghcjs/ghcjs-base.nix+5−4 pkgs/development/interpreters/scsh/default.nix+5−4 pkgs/development/tools/parsing/hammer/default.nix+5−4 pkgs/os-specific/linux/disk-indicator/default.nix+5−4 pkgs/tools/audio/pa-applet/default.nix+5−4 pkgs/tools/networking/carddav-util/default.nix+5−4 pkgs/tools/package-management/nixui/default.nix+9−9
pkgs/applications/misc/slic3r/default.nix+5−4
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchgit, perl, makeWrapper
1+{ lib, stdenv, fetchFromGitHub, perl, makeWrapper
22, makeDesktopItem, which, perlPackages, boost
33}:
44
@@ -6,10 +6,11 @@ stdenv.mkDerivation rec {
66 version = "1.3.0";
77 pname = "slic3r";
88
9− src = fetchgit {
10− url = "https://github.com/alexrj/Slic3r";
9+ src = fetchFromGitHub {
10+ owner = "alexrj";
11+ repo = "Slic3r";
1112 rev = version;
12− sha256 = "1pg4jxzb7f58ls5s8mygza8kqdap2c50kwlsdkf28bz1xi611zbi";
13+ sha256 = "sha256-cf0QTOzhLyTcbJryCQoTVzU8kfrPV6SLpqi4s36X5N0=";
1314 };
1415
1516 buildInputs =
pkgs/applications/networking/p2p/twister/default.nix+5−5
@@ -1,15 +1,15 @@
11{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, python2
2−, boost, db, openssl, geoip, libiconv, miniupnpc
3−, srcOnly, fetchgit
2+, boost, db, openssl, geoip, libiconv, miniupnpc, srcOnly
43}:
54
65let
76 twisterHTML = srcOnly {
87 name = "twister-html";
9− src = fetchgit {
10− url = "https://github.com/miguelfreitas/twister-html.git";
8+ src = fetchFromGitHub {
9+ owner = "miguelfreitas";
10+ repo = "twister-html";
1111 rev = "01e7f7ca9b7e42ed90f91bc42da2c909ca5c0b9b";
12− sha256 = "0scjbin6s1kmi0bqq0dx0qyjw4n5xgmj567n0156i39f9h0dabqy";
12+ sha256 = "sha256-Hi/VAEwujWhKAPaYIuvrxRIuPQa9AYwXiHUGbWxckmk=";
1313 };
1414 };
1515
pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix+5−4
@@ -1,13 +1,14 @@
1−{ lib, stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }:
1+{ lib, stdenv, fetchFromGitHub, ruby, gnugrep, diffutils, git, darcs }:
22
33stdenv.mkDerivation {
44 pname = "darcs-to-git";
55 version = "2015-06-04";
66
7− src = fetchgit {
8− url = "https://github.com/purcell/darcs-to-git.git";
7+ src = fetchFromGitHub {
8+ owner = "purcell";
9+ repo = "darcs-to-git";
910 rev = "e5fee32495908fe0f7d700644c7b37347b7a0a5b";
10− sha256 = "0lxcx0x0m1cv2j4x9ykpjf6r2zg6lh5rya016x93vkmlzxm3f0ji";
11+ sha256 = "sha256-UQI3av+0zj1SNwEonwuk5n2RjZN3+tSJFJuFCjrorFM=";
1112 };
1213
1314 patchPhase = let
pkgs/development/compilers/ghcjs/ghcjs-base.nix+5−4
@@ -1,5 +1,5 @@
11{ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
2−, containers, deepseq, directory, dlist, fetchgit, ghc-prim
2+, containers, deepseq, directory, dlist, fetchFromGitHub, ghc-prim
33, ghcjs-prim, hashable, HUnit, integer-gmp, primitive, QuickCheck
44, quickcheck-unicode, random, scientific, test-framework
55, test-framework-hunit, test-framework-quickcheck2, text, time
@@ -9,10 +9,11 @@
99mkDerivation {
1010 pname = "ghcjs-base";
1111 version = "0.2.0.3";
12− src = fetchgit {
13− url = "https://github.com/ghcjs/ghcjs-base";
14− sha256 = "15fdkjv0l7hpbbsn5238xxgzfdg61g666nzbv2sgxkwryn5rycv0";
12+ src = fetchFromGitHub {
13+ owner = "ghcjs";
14+ repo = "ghcjs-base";
1515 rev = "85e31beab9beffc3ea91b954b61a5d04e708b8f2";
16+ sha256 = "sha256-YDOfi/WZz/602OtbY8wL5jX3X+9oiGL1WhceCraczZU=";
1617 };
1718 libraryHaskellDepends = [
1819 aeson attoparsec base binary bytestring containers deepseq dlist
pkgs/development/interpreters/scsh/default.nix+5−4
@@ -1,14 +1,15 @@
1−{ lib, stdenv, fetchgit, autoreconfHook, scheme48 }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, scheme48 }:
22
33stdenv.mkDerivation {
44 pname = "scsh";
55 version = "0.7pre";
66
7− src = fetchgit {
8− url = "https://github.com/scheme/scsh.git";
7+ src = fetchFromGitHub {
8+ owner = "scheme";
9+ repo = "scsh";
910 rev = "f99b8c5293628cfeaeb792019072e3a96841104f";
11+ sha256 = "sha256-vcVtqoUhozdJq1beUN8/rcI2qOJYUN+0CPSiDWGCIjI=";
1012 fetchSubmodules = true;
11− sha256 = "0ci2h9hhv8pl12sdyl2qwal3dhmd7zgm1pjnmd4kg8r1hnm6vidx";
1213 };
1314
1415 nativeBuildInputs = [ autoreconfHook ];
pkgs/development/tools/parsing/hammer/default.nix+5−4
@@ -1,13 +1,14 @@
1−{ lib, stdenv, fetchgit, glib, pkg-config, scons }:
1+{ lib, stdenv, fetchFromGitHub, glib, pkg-config, scons }:
22
33stdenv.mkDerivation {
44 pname = "hammer";
55 version = "e7aa734";
66
7− src = fetchgit {
8− url = "https://github.com/UpstandingHackers/hammer";
9− sha256 = "01l0wbhz7dymxlndacin2vi8sqwjlw81ds2i9xyi200w51nsdm38";
7+ src = fetchFromGitHub {
8+ owner = "UpstandingHackers";
9+ repo = "hammer";
1010 rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533";
11+ sha256 = "sha256-aNSmbSgcABF9T1HoFhCnkmON4hY2MtUs7dW38+HigAY=";
1112 };
1213
1314 nativeBuildInputs = [ pkg-config scons ];
pkgs/os-specific/linux/disk-indicator/default.nix+5−4
@@ -1,13 +1,14 @@
1−{ lib, stdenv, fetchgit, libX11 }:
1+{ lib, stdenv, fetchFromGitHub, libX11 }:
22
33stdenv.mkDerivation {
44 pname = "disk-indicator";
55 version = "unstable-2014-05-19";
66
7− src = fetchgit {
8− url = "https://github.com/MeanEYE/Disk-Indicator.git";
7+ src = fetchFromGitHub {
8+ owner = "MeanEYE";
9+ repo = "Disk-Indicator";
910 rev = "51ef4afd8141b8d0659cbc7dc62189c56ae9c2da";
10− sha256 = "10jx6mx9qarn21p2l2jayxkn1gmqhvck1wymgsr4jmbwxl8ra5kd";
11+ sha256 = "sha256-bRaVEe18VUmyftXzMNmGuL5gZ/dKCipuEDYrnHo1XYI=";
1112 };
1213
1314 buildInputs = [ libX11 ];
pkgs/tools/audio/pa-applet/default.nix+5−4
@@ -1,13 +1,14 @@
1−{ lib, stdenv, fetchgit, libpulseaudio, pkg-config, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
1+{ lib, stdenv, fetchFromGitHub, libpulseaudio, pkg-config, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
22
33stdenv.mkDerivation {
44 pname = "pa-applet";
55 version = "unstable-2012-04-11";
66
7− src = fetchgit {
8− url = "https://github.com/fernandotcl/pa-applet.git";
7+ src = fetchFromGitHub {
8+ owner = "fernandotcl";
9+ repo = "pa-applet";
910 rev = "005f192df9ba6d2e6491f9aac650be42906b135a";
10− sha256 = "1242sdri67wnm1cd0hr40mxarkh7qs7mb9n2m0g9dbz0f4axj6wa";
11+ sha256 = "sha256-ihvZFXHgr5YeqMKmVY/GB86segUkQ9BYqJYfE3PTgog=";
1112 };
1213
1314 nativeBuildInputs = [ pkg-config ];
pkgs/tools/networking/carddav-util/default.nix+5−4
@@ -1,13 +1,14 @@
1−{ lib, stdenv, fetchgit, python3Packages, makeWrapper }:
1+{ lib, stdenv, fetchFromGitHub, python3Packages, makeWrapper }:
22
33stdenv.mkDerivation {
44 pname = "carddav";
55 version = "0.1-2014-02-26";
66
7− src = fetchgit {
8− url = "https://github.com/ljanyst/carddav-util";
7+ src = fetchFromGitHub {
8+ owner = "ljanyst";
9+ repo = "carddav-util";
910 rev = "53b181faff5f154bcd180467dd04c0ce69405564";
10− sha256 = "0f0raffdy032wlnxfck6ky60r163nhqfbr311y4ry55l60s4497n";
11+ sha256 = "sha256-9iRCNDC0FJ+JD2Hk5TC0w4QMjJ9mMtct5WIA35xTGTg=";
1112 };
1213
1314 nativeBuildInputs = [ makeWrapper ];
pkgs/tools/package-management/nixui/default.nix+9−9
@@ -1,12 +1,6 @@
1−{ lib, stdenv, pkgs, fetchgit, nix, node_webkit, makeDesktopItem
1+{ lib, stdenv, pkgs, fetchFromGitHub, nix, node_webkit, makeDesktopItem
22, writeScript }:
33let
4− version = "0.2.1";
5− src = fetchgit {
6− url = "https://github.com/matejc/nixui.git";
7− rev = "845a5f4a33f1d0c509c727c130d0792a5b450a38";
8− sha256 = "1ay3i4lgzs3axbby06l4vvspxi0aa9pwiil84qj0dqq1jb6isara";
9− };
104 nixui = (import ./nixui.nix {
115 inherit pkgs;
126 inherit (stdenv.hostPlatform) system;
@@ -24,9 +18,15 @@ let
2418 genericName = "NixUI";
2519 };
2620in
27−stdenv.mkDerivation {
21+stdenv.mkDerivation rec {
2822 pname = "nixui";
29− inherit version src;
23+ version = "0.2.1";
24+ src = fetchFromGitHub {
25+ owner = "matejc";
26+ repo = "nixui";
27+ rev = version;
28+ sha256 = "sha256-KisdzZIB4wYkJojGyG9SCsR+9d6EGuDX6mro/yiJw6s=";
29+ };
3030 installPhase = ''
3131 mkdir -p $out/bin
3232 ln -s ${script} $out/bin/nixui