git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #164248 from Stunkymonkey/treewide-fetchFromGitHub-2
commit4348e3645655de31f3c49bbe3b6c3713c59b9874 authorSandro <sandro.jaeckel@gmail.com> dateTue 22 Mar 2022, 02:13 (5 years ago) parent86e74a410d595e
32 files changed+200−185
pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix+5−4 pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix+4−3 pkgs/applications/misc/mop/default.nix+8−8 pkgs/applications/misc/nix-tour/default.nix+5−4 pkgs/applications/misc/tpmmanager/default.nix+6−5 pkgs/applications/networking/instant-messengers/matrixcli/default.nix+5−5 pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix+8−10 pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix+6−8 pkgs/applications/networking/instant-messengers/pond/default.nix+7−7 pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix+4−3 pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix+4−3 pkgs/applications/networking/instant-messengers/tensor/default.nix+5−4 pkgs/applications/networking/irc/communi/default.nix+5−4 pkgs/applications/office/mmex/default.nix+26−29 pkgs/applications/science/math/cntk/default.nix+6−5 pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix+7−7 pkgs/applications/virtualization/spike/default.nix+4−3 pkgs/applications/window-managers/btops/default.nix+5−5 pkgs/data/fonts/rictydiminished-with-firacode/default.nix+5−4 pkgs/development/chez-modules/chez-mit/default.nix+8−7 pkgs/development/chez-modules/chez-scmutils/default.nix+8−7 pkgs/development/chez-modules/chez-srfi/default.nix+5−4 pkgs/development/compilers/aldor/default.nix+5−4 pkgs/development/compilers/nim/default.nix+4−4 pkgs/development/compilers/opendylan/default.nix+5−4 pkgs/development/embedded/bossa/default.nix+7−6 pkgs/development/interpreters/ceptre/default.nix+6−4 pkgs/development/interpreters/pixie/default.nix+5−4 pkgs/development/libraries/java/hydra-ant-logger/default.nix+5−4 pkgs/development/lisp-modules/lisp-packages.nix+5−4 pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix+5−4 pkgs/development/php-packages/memcached/default.nix+7−8
pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix+5−4
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchgit, pkg-config, linkFarm, lightdm-enso-os-greeter
1+{ lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter
22, dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
33, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
44
@@ -6,10 +6,11 @@ stdenv.mkDerivation {
66 version = "0.2.1";
77 pname = "lightdm-enso-os-greeter";
88
9− src = fetchgit {
10− url = "https://github.com/nick92/Enso-OS";
9+ src = fetchFromGitHub {
10+ owner = "nick92";
11+ repo = "Enso-OS";
1112 rev = "ed48330bfd986072bd82ac542ed8f8a7365c6427";
12− sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz";
13+ sha256 = "sha256-v79J5KyjeJ99ifN7nK/B+J7f292qDAEHsmsHLAMKVYY=";
1314 };
1415
1516 patches = [
pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix+4−3
@@ -1,11 +1,12 @@
11let
22 pkgs = import ../../../../.. { };
33
4− src = pkgs.fetchgit {
5− url = "https://github.com/nix-community/emacs2nix.git";
6− fetchSubmodules = true;
4+ src = pkgs.fetchFromGitHub {
5+ owner = "nix-community";
6+ repo = "emacs2nix";
77 rev = "2e8d2c644397be57455ad32c2849f692eeac7797";
88 sha256 = "sha256-qnOYDYHAQ+r5eegKP9GqHz5R2ig96B2W7M+uYa1ti9M=";
9+ fetchSubmodules = true;
910 };
1011in
1112pkgs.mkShell {
pkgs/applications/misc/mop/default.nix+8−8
@@ -1,9 +1,15 @@
1−{ lib, buildGoPackage, fetchgit }:
1+{ lib, buildGoPackage, fetchFromGitHub }:
22
33buildGoPackage rec {
44 pname = "mop";
55 version = "0.2.0";
6− rev = "bc666ec165d08b43134f7ec0bf29083ad5466243";
6+
7+ src = fetchFromGitHub {
8+ owner = "mop-tracker";
9+ repo = "mop";
10+ rev = "bc666ec165d08b43134f7ec0bf29083ad5466243";
11+ sha256 = "sha256-fX7G4M3gfv31Eb2HChTY4RfVF2U92000U4ZnFNML5X4=";
12+ };
713
814 goPackagePath = "github.com/michaeldv/mop";
915 goDeps = ./deps.nix;
@@ -16,12 +22,6 @@ buildGoPackage rec {
1622 mv cmd mop
1723 '';
1824
19− src = fetchgit {
20− inherit rev;
21− url = "https://github.com/mop-tracker/mop";
22− sha256 = "0zp51g9i8rw6acs4vnrxclbxa5z1v0a0m1xx27szszp0rphcczkx";
23− };
24−
2525 meta = with lib; {
2626 description = "Simple stock tracker implemented in go";
2727 homepage = "https://github.com/mop-tracker/mop";
pkgs/applications/misc/nix-tour/default.nix+5−4
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchgit, electron, runtimeShell } :
1+{ lib, stdenv, fetchFromGitHub, electron, runtimeShell } :
22
33stdenv.mkDerivation rec {
44 pname = "nix-tour";
@@ -6,10 +6,11 @@ stdenv.mkDerivation rec {
66
77 buildInputs = [ electron ];
88
9− src = fetchgit {
10− url = "https://github.com/nixcloud/tour_of_nix";
9+ src = fetchFromGitHub {
10+ owner = "nixcloud";
11+ repo = "tour_of_nix";
1112 rev = "v${version}";
12− sha256 = "09b1vxli4zv1nhqnj6c0vrrl51gaira94i8l7ww96fixqxjgdwvb";
13+ sha256 = "sha256-a/P2ZMc9OpM4PxRFklSO6oVCc96AGWkxtGF/EmnfYSU=";
1314 };
1415
1516 installPhase = ''
pkgs/applications/misc/tpmmanager/default.nix+6−5
@@ -1,13 +1,14 @@
1−{ lib, stdenv, fetchgit, qt4, qmake4Hook, trousers }:
1+{ lib, stdenv, fetchFromGitHub, qt4, qmake4Hook, trousers }:
22
33stdenv.mkDerivation rec {
44 version = "0.8.1";
55 pname = "tpmmanager";
66
7− src = fetchgit {
8− url = "https://github.com/Sirrix-AG/TPMManager";
9− rev = "9f989206635a6d2c1342576c90fa73eb239519cd";
10− sha256 = "24a606f88fed67ed0d0e61dc220295e9e1ab8db3ef3d028fa34b04ff30652d8e";
7+ src = fetchFromGitHub {
8+ owner = "Rohde-Schwarz";
9+ repo = "TPMManager";
10+ rev = "v${version}";
11+ sha256 = "sha256-JKYG+I/tZ+0NDmHcIgKV6eGrjbPvPQKPo0sE/zBlLY4=";
1112 };
1213
1314 nativeBuildInputs = [ qmake4Hook ];
pkgs/applications/networking/instant-messengers/matrixcli/default.nix+5−5
@@ -1,13 +1,14 @@
1−{ lib, fetchgit
1+{ lib, fetchFromGitHub
22 , buildPythonApplication, buildPythonPackage
33 , pygobject3, pytest-runner, requests, responses, pytest, python-olm
44 , canonicaljson, olm
55}:
66let
7− mainsrc = fetchgit {
8− url = "https://github.com/saadnpq/matrixcli";
7+ mainsrc = fetchFromGitHub {
8+ owner = "saadnpq";
9+ repo = "matrixcli";
910 rev = "61ebde173ca2f77185c261c2b7f6db297ca89863";
10− sha256 = "0xcjjy2xwlcixr9fwgzcfjjkivqpk104h7dslfa7lz9jq9pzqzvq";
11+ sha256 = "sha256-eH/8b8IyfXqUo7odSECYF+84pXTsP+5S7pFR3oWXknU=";
1112 fetchSubmodules = true;
1213 };
1314
@@ -35,7 +36,6 @@ let
3536
3637in
3738buildPythonApplication rec {
38− name = "${pname}-${version}";
3939 pname = "matrixcli";
4040 version = "0.0.2019-08-15";
4141
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix+8−10
@@ -1,16 +1,14 @@
1−{ lib, stdenv, fetchgit, pkg-config, pidgin } :
1+{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin } :
22
3−let
4− version = "54b2992";
5−in
6−stdenv.mkDerivation {
3+stdenv.mkDerivation rec {
74 pname = "pidgin-mra";
8− inherit version;
5+ version = "unstable-2014-07-08";
96
10− src = fetchgit {
11− url = "https://github.com/dreadatour/pidgin-mra";
12− rev = version;
13− sha256 = "1adq57g11kw7bfpivyvfk3nlpjkc8raiw4bzn3gn4nx3m0wl99vw";
7+ src = fetchFromGitHub {
8+ owner = "dreadatour";
9+ repo = "pidgin-mra";
10+ rev = "54b299266265cde800289b2d51f13b81f6bf379c";
11+ sha256 = "sha256-fKdEOaijW2LfsH8RHlVGbMpL7Zhu+x2vW4fPEN4puKk=";
1412 };
1513
1614 nativeBuildInputs = [ pkg-config ];
pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix+6−8
@@ -1,16 +1,14 @@
1−{ lib, stdenv, fetchgit, pkg-config, pidgin, libwebp, libgcrypt, gettext } :
1+{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, libwebp, libgcrypt, gettext } :
22
3−let
4− version = "1.3.1";
5−in
63stdenv.mkDerivation rec {
74 pname = "telegram-purple";
8− inherit version;
5+ version = "1.3.1";
96
10− src = fetchgit {
11− url = "https://github.com/majn/telegram-purple";
7+ src = fetchFromGitHub {
8+ owner = "majn";
9+ repo = "telegram-purple";
1210 rev = "v${version}";
13− sha256 = "0p93jpjpx7hszwffzgixw04zkrpsiyzz4za3gfr4j07krc4771fp";
11+ sha256 = "sha256-14VzCMvzAEmye0N98r+P+ub5CeA9vu8c/xqefuWVI10=";
1412 };
1513
1614 NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
pkgs/applications/networking/instant-messengers/pond/default.nix+7−7
@@ -1,20 +1,20 @@
11{ lib, stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkg-config, gtk3, gtkspell3,
2− fetchgit }:
2+ fetchFromGitHub }:
33
44let
55 gui = true; # Might be implemented with nixpkgs config.
66in
77buildGoPackage rec {
88 pname = "pond";
9− version = "20150830-${lib.strings.substring 0 7 rev}";
10− rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2";
9+ version = "unstable-2015-08-30";
1110
1211 goPackagePath = "github.com/agl/pond";
1312
14− src = fetchgit {
15− inherit rev;
16− url = "https://github.com/agl/pond";
17− sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4";
13+ src = fetchFromGitHub {
14+ owner = "agl";
15+ repo = "pond";
16+ rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2";
17+ sha256 = "sha256-BE7+146E9hz8enrfA+sQhtqgHiSZAtjrW1OOqchbr7Y=";
1818 };
1919
2020 goDeps = ./deps.nix;
pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix+4−3
@@ -2,7 +2,7 @@
22, element-desktop # for seshat and keytar
33, schildichat-web
44, stdenv
5−, fetchgit
5+, fetchFromGitHub
66, makeWrapper
77, makeDesktopItem
88, copyDesktopItems
@@ -25,8 +25,9 @@ stdenv.mkDerivation rec {
2525 pname = "schildichat-desktop";
2626 inherit (pinData) version;
2727
28− src = fetchgit {
29− url = "https://github.com/SchildiChat/schildichat-desktop/";
28+ src = fetchFromGitHub {
29+ owner = "SchildiChat";
30+ repo = "schildichat-desktop";
3031 inherit (pinData) rev;
3132 sha256 = pinData.srcHash;
3233 fetchSubmodules = true;
pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix+4−3
@@ -1,5 +1,5 @@
11{ stdenv, lib
2−, fetchgit
2+, fetchFromGitHub
33, fetchYarnDeps
44, nodejs
55, yarn
@@ -18,8 +18,9 @@ in stdenv.mkDerivation rec {
1818 pname = "schildichat-web";
1919 inherit (pinData) version;
2020
21− src = fetchgit {
22− url = "https://github.com/SchildiChat/schildichat-desktop/";
21+ src = fetchFromGitHub {
22+ owner = "SchildiChat";
23+ repo = "schildichat-desktop";
2324 inherit (pinData) rev;
2425 sha256 = pinData.srcHash;
2526 fetchSubmodules = true;
pkgs/applications/networking/instant-messengers/tensor/default.nix+5−4
@@ -1,7 +1,7 @@
11{ mkDerivation
22, lib
33, stdenv
4−, fetchgit
4+, fetchFromGitHub
55, qtbase
66, qtquickcontrols
77, qmake
@@ -15,10 +15,11 @@ mkDerivation rec {
1515 pname = "tensor";
1616 version = "unstable-2017-02-21";
1717
18− src = fetchgit {
19− url = "https://github.com/davidar/tensor.git";
18+ src = fetchFromGitHub {
19+ owner = "davidar";
20+ repo = "tensor";
2021 rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5";
21− sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9";
22+ sha256 = "sha256-aR6TsfUxsxoSDaIWYgRCwd7BCgekSEqY6LpDoQ5DNqY=";
2223 fetchSubmodules = true;
2324 };
2425
pkgs/applications/networking/irc/communi/default.nix+5−4
@@ -1,13 +1,14 @@
1−{ fetchgit, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }:
1+{ fetchFromGitHub, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }:
22
33stdenv.mkDerivation rec {
44 pname = "communi";
55 version = "3.5.0";
66
7− src = fetchgit {
8− url = "https://github.com/communi/communi-desktop.git";
7+ src = fetchFromGitHub {
8+ owner = "communi";
9+ repo = "communi-desktop";
910 rev = "v${version}";
10− sha256 = "10grskhczh8601s90ikdsbjabgr9ypcp2j7vivjkl456rmg6xbji";
11+ sha256 = "sha256-Ua5uXs2mEDrljvtIcdn1Kb+l5NJtRpB0AAbBz+DU+YE=";
1112 fetchSubmodules = true;
1213 };
1314
pkgs/applications/office/mmex/default.nix+26−29
@@ -1,35 +1,32 @@
1−{ lib, stdenv, fetchgit, sqlite, wxGTK30, gettext, wrapGAppsHook }:
1+{ lib, stdenv, fetchFromGitHub, sqlite, wxGTK30, gettext, wrapGAppsHook }:
22
3−
4−let
3+stdenv.mkDerivation rec {
4+ pname = "money-manager-ex";
55 version = "1.3.3";
6−in
7− stdenv.mkDerivation {
8− pname = "money-manager-ex";
9− inherit version;
106
11− src = fetchgit {
12− url = "https://github.com/moneymanagerex/moneymanagerex.git";
13− rev = "refs/tags/v${version}";
14− sha256 = "0r4n93z3scv0i0zqflsxwv7j4yl8jy3gr0m4l30y1q8qv0zj9n74";
15− };
7+ src = fetchFromGitHub {
8+ owner = "moneymanagerex";
9+ repo = "moneymanagerex";
10+ rev = "refs/tags/v${version}";
11+ sha256 = "sha256-5NgkP9gY4eDBoKSC/IaXiHoiz+ZdU4c/iGAzPf5IlmQ=";
12+ };
1613
17− nativeBuildInputs = [
18− wrapGAppsHook
19− ];
14+ nativeBuildInputs = [
15+ wrapGAppsHook
16+ ];
2017
21− buildInputs = [
22− gettext
23− sqlite
24− wxGTK30
25− wxGTK30.gtk
26− ];
18+ buildInputs = [
19+ gettext
20+ sqlite
21+ wxGTK30
22+ wxGTK30.gtk
23+ ];
2724
28− meta = {
29− description = "Easy-to-use personal finance software";
30− homepage = "https://www.moneymanagerex.org/";
31− license = lib.licenses.gpl2Plus;
32− maintainers = with lib.maintainers; [viric];
33− platforms = with lib.platforms; linux;
34− };
35− }
25+ meta = {
26+ description = "Easy-to-use personal finance software";
27+ homepage = "https://www.moneymanagerex.org/";
28+ license = lib.licenses.gpl2Plus;
29+ maintainers = with lib.maintainers; [viric];
30+ platforms = with lib.platforms; linux;
31+ };
32+}
pkgs/applications/science/math/cntk/default.nix+6−5
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchgit, fetchFromGitHub, cmake
1+{ lib, stdenv, fetchFromGitHub, cmake
22, fetchpatch
33, openblas, blas, lapack, opencv3, libzip, boost, protobuf, mpi
44, onebitSGDSupport ? false
@@ -22,11 +22,12 @@ in stdenv.mkDerivation rec {
2222 pname = "CNTK";
2323 version = "2.7";
2424
25− # Submodules
26− src = fetchgit {
27− url = "https://github.com/Microsoft/CNTK";
25+ src = fetchFromGitHub {
26+ owner = "Microsoft";
27+ repo = "CNTK";
2828 rev = "v${version}";
29− sha256 = "18l9k7s966a26ywcf7flqyhm61788pcb9fj3wk61jrmgkhy2pcns";
29+ sha256 = "sha256-2rIrPJyvZhnM5EO6tNhF6ARTocfUHce4N0IZk/SZiaI=";
30+ fetchSubmodules = true;
3031 };
3132
3233 patches = [
pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix+7−7
@@ -1,16 +1,16 @@
1−{ lib, buildGoPackage, fetchgit }:
1+{ lib, buildGoPackage, fetchFromGitHub }:
22
33buildGoPackage rec {
44 pname = "git-annex-remote-b2";
5− version = "20151212-${lib.strings.substring 0 7 rev}";
6− rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba";
5+ version = "unstable-2015-12-12";
76
87 goPackagePath = "github.com/encryptio/git-annex-remote-b2";
98
10− src = fetchgit {
11− inherit rev;
12− url = "https://github.com/encryptio/git-annex-remote-b2";
13− sha256 = "1139rzdvlj3hanqsccfinprvrzf4qjc5n4f0r21jp9j24yhjs6j2";
9+ src = fetchFromGitHub {
10+ owner = "encryptio";
11+ repo = "git-annex-remote-b2";
12+ rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba";
13+ sha256 = "sha256-QhotoSdCpiuDyMARW5jExP2887XRMaaxVXBIutvPaYQ=";
1414 };
1515
1616 goDeps = ./deps.nix;
pkgs/applications/virtualization/spike/default.nix+4−3
@@ -1,11 +1,12 @@
1−{ lib, stdenv, fetchgit, dtc, fetchpatch, pkgsCross }:
1+{ lib, stdenv, fetchFromGitHub, dtc, fetchpatch, pkgsCross }:
22
33stdenv.mkDerivation rec {
44 pname = "spike";
55 version = "1.0.0";
66
7− src = fetchgit {
8− url = "https://github.com/riscv/riscv-isa-sim.git";
7+ src = fetchFromGitHub {
8+ owner = "riscv";
9+ repo = "riscv-isa-sim";
910 rev = "v${version}";
1011 sha256 = "1hcl01nj96s3rkz4mrq747s5lkw81lgdjdimb8b1b9h8qnida7ww";
1112 };
pkgs/applications/window-managers/btops/default.nix+5−5
@@ -1,5 +1,4 @@
1−# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
2−{ lib, buildGoPackage, fetchgit }:
1+{ lib, buildGoPackage, fetchFromGitHub }:
32
43buildGoPackage rec {
54 pname = "btops";
@@ -7,10 +6,11 @@ buildGoPackage rec {
76
87 goPackagePath = "github.com/cmschuetz/btops";
98
10− src = fetchgit {
11− url = "https://github.com/cmschuetz/btops.git";
9+ src = fetchFromGitHub {
10+ owner = "cmschuetz";
11+ repo = "btops";
1212 rev = version;
13− sha256 = "1ilidvpy7gz49zqp6rf0q7wjrc3r0brdrcp4r5f6i6p9cwybqkbq";
13+ sha256 = "sha256-eE28PGfpmmhcyeSy3PICebAs+cHAZXPxT+S/4+9ukcY=";
1414 };
1515
1616 goDeps = ./deps.nix;
pkgs/data/fonts/rictydiminished-with-firacode/default.nix+5−4
@@ -1,13 +1,14 @@
1−{ lib, stdenv, fetchgit, fontforge, python3 }:
1+{ lib, stdenv, fetchFromGitHub, fontforge, python3 }:
22
33stdenv.mkDerivation rec {
44 pname = "rictydiminished-with-firacode";
55 version = "1.2.2";
66
7− src = fetchgit {
8− url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git";
7+ src = fetchFromGitHub {
8+ owner = "hakatashi";
9+ repo = "RictyDiminished-with-FiraCode";
910 rev = version;
10− sha256 = "0khnbp1y5xrd77gfb2b19mzi3ll07im3d0rlbciwbq0cn347f25p";
11+ sha256 = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4=";
1112 fetchSubmodules = true;
1213 };
1314
pkgs/development/chez-modules/chez-mit/default.nix+8−7
@@ -1,13 +1,14 @@
1−{ stdenv, lib, fetchgit, chez, chez-srfi }:
1+{ stdenv, lib, fetchFromGitHub, chez, chez-srfi }:
22
3−stdenv.mkDerivation {
3+stdenv.mkDerivation rec {
44 pname = "chez-mit";
5− version = "1.0";
5+ version = "0.1";
66
7− src = fetchgit {
8− url = "https://github.com/fedeinthemix/chez-mit.git";
9− rev = "68f3d7562e77f694847dc74dabb5ecbd106cd6be";
10− sha256 = "0c7i3b6i90xk96nmxn1pc9272a4yal4v40dm1a4ybdi87x53zkk0";
7+ src = fetchFromGitHub {
8+ owner = "fedeinthemix";
9+ repo = "chez-mit";
10+ rev = "v${version}";
11+ sha256 = "sha256-YM4/Sj8otuWJCrUBsglVnihxRGI32F6tSbODFM0a8TA=";
1112 };
1213
1314 buildInputs = [ chez chez-srfi ];
pkgs/development/chez-modules/chez-scmutils/default.nix+8−7
@@ -1,13 +1,14 @@
1−{ stdenv, lib, fetchgit, chez, chez-srfi, chez-mit }:
1+{ stdenv, lib, fetchFromGitHub, chez, chez-srfi, chez-mit }:
22
3−stdenv.mkDerivation {
3+stdenv.mkDerivation rec {
44 pname = "chez-scmutils";
5− version = "1.0";
5+ version = "0.1";
66
7− src = fetchgit {
8− url = "https://github.com/fedeinthemix/chez-scmutils.git";
9− rev = "5eaeea6289fd239358d7eed99cc9588528fb52b2";
10− sha256 = "0lb05wlf8qpgg8y0gdsyaxg1nbfx1qbaqdjvygrp64ndn8fnhq7l";
7+ src = fetchFromGitHub {
8+ owner = "fedeinthemix";
9+ repo = "chez-scmutils";
10+ rev = "v${version}";
11+ sha256 = "sha256-9GBoHbLNEnPz81s2rBYO3S0bXldetwc8eu9i5CgvYFE=";
1112 };
1213
1314 buildInputs = [ chez chez-srfi chez-mit ];
pkgs/development/chez-modules/chez-srfi/default.nix+5−4
@@ -1,13 +1,14 @@
1−{ stdenv, lib, fetchgit, chez }:
1+{ stdenv, lib, fetchFromGitHub, chez }:
22
33stdenv.mkDerivation {
44 pname = "chez-srfi";
55 version = "1.0";
66
7− src = fetchgit {
8− url = "https://github.com/fedeinthemix/chez-srfi.git";
7+ src = fetchFromGitHub {
8+ owner = "fedeinthemix";
9+ repo = "chez-srfi";
910 rev = "5770486c2a85d0e3dd4ac62a97918e7c394ea507";
10− sha256 = "1s47v7b7w0ycd2g6gyv8qbzmh4jjln5iday8n9l3m996ns8is9zj";
11+ sha256 = "sha256-8icdkbYmpTpossirFoulUhJY/8Jo+2eeaMwDftbZh+g=";
1112 };
1213
1314 buildInputs = [ chez ];
pkgs/development/compilers/aldor/default.nix+5−4
@@ -1,14 +1,15 @@
1−{ fetchgit, lib, stdenv, gmp, which, flex, bison, makeWrapper
1+{ fetchFromGitHub, lib, stdenv, gmp, which, flex, bison, makeWrapper
22, autoconf, automake, libtool, jdk, perl }:
33
44stdenv.mkDerivation {
55 pname = "aldor";
66 version = "1.2.0";
77
8− src = fetchgit {
9− url = "https://github.com/pippijn/aldor";
10− sha256 = "19v07ffq4r1gjnmg7a8ifgjkwan9a3rwbj0qjz8fycwy221844m6";
8+ src = fetchFromGitHub {
9+ owner = "aldorlang";
10+ repo = "aldor";
1111 rev = "15471e75f3d65b93150f414ebcaf59a03054b68d";
12+ sha256 = "sha256-phKCghCeM+/QlxjIxfNQySo+5XMRqfOqlS9kgp07YKc=";
1213 };
1314
1415 nativeBuildInputs = [ makeWrapper ];
pkgs/development/compilers/nim/default.nix+4−4
@@ -78,11 +78,11 @@ let
7878 pname = "nim-bootstrap";
7979 version = "g${lib.substring 0 7 revision}";
8080
81− src = fetchgit {
82− # A Git checkout is much smaller than a GitHub tarball.
83− url = "https://github.com/nim-lang/csources_v1.git";
81+ src = fetchFromGitHub {
82+ owner = "nim-lang";
83+ repo = "csources_v1";
8484 rev = revision;
85− sha256 = "1c2k681knrha1zmf4abhb32i2wwd3nwflzylnqryxk753swla043";
85+ sha256 = "sha256-gwBFuR7lzO4zttR/6rgdjXMRxVhwKeLqDwpmOwMyU7A=";
8686 };
8787
8888 enableParallelBuilding = true;
pkgs/development/compilers/opendylan/default.nix+5−4
@@ -1,14 +1,15 @@
11# Build Open Dylan from source using the binary builds to bootstrap.
2−{lib, stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }:
2+{lib, stdenv, fetchFromGitHub, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }:
33
44stdenv.mkDerivation {
55 pname = "opendylan";
66 version = "2016.1pre";
77
8− src = fetchgit {
9− url = "https://github.com/dylan-lang/opendylan";
8+ src = fetchFromGitHub {
9+ owner = "dylan-lang";
10+ repo = "opendylan";
1011 rev = "cd9a8395586d33cc43a8611c1dc0513e69ee82dd";
11− sha256 = "00r1dm7mjy5p4hfm13vc4b6qryap40zinia3y15rhvalc3i2np4b";
12+ sha256 = "sha256-i1wr4mBUbZhL8ENFGz8gV/mMzSJsj1AdJLd4WU9tIQM=";
1213 fetchSubmodules = true;
1314 };
1415
pkgs/development/embedded/bossa/default.nix+7−6
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchgit, wxGTK, libX11, readline }:
1+{ lib, stdenv, fetchFromGitHub, wxGTK, libX11, readline }:
22
33let
44 # BOSSA needs a "bin2c" program to embed images.
@@ -13,14 +13,15 @@ let
1313 };
1414
1515in
16−stdenv.mkDerivation {
16+stdenv.mkDerivation rec {
1717 pname = "bossa";
1818 version = "1.8";
1919
20− src = fetchgit {
21− url = "https://github.com/shumatech/BOSSA";
22− rev = "3be622ca0aa6214a2fc51c1ec682c4a58a423d62";
23− sha256 = "19ik86qbffcb04cgmi4mnascbkck4ynfj87ha65qdk6fmp5q35vm";
20+ src = fetchFromGitHub {
21+ owner = "shumatech";
22+ repo = "BOSSA";
23+ rev = version;
24+ sha256 = "sha256-dZeBy63OzIaLUfAg6awnk83FtLKVxPoYAYs5t7BBM6Y=";
2425 };
2526
2627 patches = [ ./bossa-no-applet-build.patch ];
pkgs/development/interpreters/ceptre/default.nix+6−4
@@ -1,13 +1,15 @@
1−{ lib, stdenv, fetchgit, mlton }:
1+{ lib, stdenv, fetchFromGitHub, mlton }:
22
33stdenv.mkDerivation {
44 pname = "ceptre";
55 version = "unstable-2016-11-27";
66
7− src = fetchgit {
8− url = "https://github.com/chrisamaphone/interactive-lp";
7+ src = fetchFromGitHub {
8+ owner = "chrisamaphone";
9+ repo = "interactive-lp";
910 rev = "e436fda2ccd44e9c9d226feced9d204311deacf5";
10− sha256 = "174pxfnw3qyn2w8qxmx45fa68iddf106mkfi0kcmyqxzsc9jprh8";
11+ sha256 = "sha256-COYrE9O/Y1/ZBNHNakBwrUVklCuk144RF9bjwa3rl5w=";
12+ fetchSubmodules = true;
1113 };
1214
1315 nativeBuildInputs = [ mlton ];
pkgs/development/interpreters/pixie/default.nix+5−4
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc,
1+{ lib, stdenv, fetchFromGitHub, fetchurl, python2, makeWrapper, pkg-config, gcc,
22 pypy, libffi, libedit, libuv, boost, zlib,
33 variant ? "jit", buildWithPypy ? false }:
44
@@ -11,10 +11,11 @@ let
1111 no-jit = { flags = ""; target = "target.py"; };
1212 no-jit-preload = { flags = ""; target = "target_preload.py"; };
1313 };
14− pixie-src = fetchgit {
15− url = "https://github.com/pixie-lang/pixie.git";
14+ pixie-src = fetchFromGitHub {
15+ owner = "pixie-lang";
16+ repo = "pixie";
1617 rev = "5eb0ccbe8b0087d3a5f2d0bbbc6998d624d3cd62";
17− sha256 = "0pf31x5h2m6dpxlidv98qay1y179qw40cw4cb4v4xa88gmq2f3vm";
18+ sha256 = "sha256-dQ8ncH0IqU42WYxwBgjH6QQfvMIo7RZpv81UAUsPw10=";
1819 };
1920 pypy-tag = "91db1a9";
2021 pypy-src = fetchurl {
pkgs/development/libraries/java/hydra-ant-logger/default.nix+5−4
@@ -1,13 +1,14 @@
1−{ fetchgit, lib, stdenv, ant, jdk }:
1+{ fetchFromGitHub, lib, stdenv, ant, jdk }:
22
33stdenv.mkDerivation {
44 pname = "hydra-ant-logger";
55 version = "2010.2";
66
7− src = fetchgit {
8− url = "https://github.com/NixOS/hydra-ant-logger.git";
7+ src = fetchFromGitHub {
8+ owner = "NixOS";
9+ repo = "hydra-ant-logger";
910 rev = "dae3224f4ed42418d3492bdf5bee4f825819006f";
10− sha256 = "01s7m6007rn9107rw5wcgna7i20x6p6kfzl4f79jrvpkjy6kz176";
11+ sha256 = "sha256-5oQ/jZfz7izTcYR+N801HYh4lH2MF54PCMnmA4CpRwc=";
1112 };
1213
1314 buildInputs = [ ant jdk ];
pkgs/development/lisp-modules/lisp-packages.nix+5−4
@@ -14,10 +14,11 @@ let lispPackages = rec {
1414
1515 description = "The Common Lisp package manager";
1616 deps = [];
17− src = pkgs.fetchgit {
18− url = "https://github.com/quicklisp/quicklisp-client/";
19− rev = "refs/tags/version-${version}";
20− sha256 = "sha256:102f1chpx12h5dcf659a9kzifgfjc482ylf73fg1cs3w34zdawnl";
17+ src = pkgs.fetchFromGitHub {
18+ owner = "quicklisp";
19+ repo = "quicklisp-client";
20+ rev = "version-${version}";
21+ sha256 = "sha256-1HLVPhl8aBaeG8dRLxBh0j0X/0wqFeNYK1CEfiELToA=";
2122 };
2223 overrides = x: rec {
2324 inherit clwrapper;
pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix+5−4
@@ -1,13 +1,14 @@
1−{ mkDerivation, ansi-wl-pprint, base, fetchgit, lib, process, QuickCheck
1+{ mkDerivation, ansi-wl-pprint, base, fetchFromGitHub, lib, process, QuickCheck
22, transformers, transformers-compat
33}:
44mkDerivation {
55 pname = "hercules-ci-optparse-applicative";
66 version = "0.16.1.0";
7− src = fetchgit {
8− url = "https://github.com/hercules-ci/optparse-applicative.git";
9− sha256 = "05vchaw2rf46hh2128qjpky686iy5hff964mbdhcyiz612jjflyp";
7+ src = fetchFromGitHub {
8+ owner = "hercules-ci";
9+ repo = "optparse-applicative";
1010 rev = "9e2968c09a7c5b29d04578dc68d81ce5aec0591e";
11+ sha256 = "sha256-11MnpQjmR89gW5WY5BwsPhpk/LwSIxEEhIa4LLiCbBc=";
1112 };
1213 libraryHaskellDepends = [
1314 ansi-wl-pprint base process transformers transformers-compat
pkgs/development/php-packages/memcached/default.nix+7−8
@@ -1,15 +1,14 @@
1−{ buildPecl, lib, fetchgit, php, cyrus_sasl, zlib, pkg-config, libmemcached }:
2−let
1+{ buildPecl, lib, fetchFromGitHub, php, cyrus_sasl, zlib, pkg-config, libmemcached }:
2+
3+buildPecl rec {
34 pname = "memcached";
45 version = "3.1.5";
5−in
6−buildPecl {
7− inherit pname version;
86
9− src = fetchgit {
10− url = "https://github.com/php-memcached-dev/php-memcached";
7+ src = fetchFromGitHub {
8+ owner = "php-memcached-dev";
9+ repo = "php-memcached";
1110 rev = "v${version}";
12− sha256 = "01mbh2m3kfbdvih3c8g3g9h4vdd80r0i9g2z8b3lx3mi8mmcj380";
11+ sha256 = "sha256-AA3JakWxjk7HQl+8FEEGqLVNYHrjITZg3G25OaqAqwY=";
1312 };
1413
1514 internalDeps = [