alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #163582 from Stunkymonkey/treewide-fetchFromGitHub-1

Browse source
This commit is contained in:
Sandro 2022-03-22 07:27:54 +01:00 committed by GitHub
parent 5b29802291 fca3e2ac93
commit 5b874cadbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
41 changed files with 302 additions and 251 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
View file

@ -3,8 +3,8 @@
, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
stdenv.mkDerivation { stdenv.mkDerivation {
version = "0.2.1";
pname = "lightdm-enso-os-greeter"; pname = "lightdm-enso-os-greeter";
version = "0.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nick92"; owner = "nick92";

13
pkgs/development/python-modules/editorconfig/default.nix
View file

@ -1,6 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchgit , fetchFromGitHub
, cmake , cmake
}: }:
@ -8,11 +8,12 @@ buildPythonPackage rec {
pname = "editorconfig"; pname = "editorconfig";
version = "0.12.3"; version = "0.12.3";
# fetchgit used to ensure test submodule is available src = fetchFromGitHub {
src = fetchgit { owner = "editorconfig";
url = "https://github.com/editorconfig/editorconfig-core-py"; repo = "editorconfig-core-py";
rev = "1a8fb62b9941fded9e4fb83a3d0599427f5484cb"; # Not tagged rev = "v${version}";
sha256 = "0vx8rl7kii72965jsi01mdsz9rfi1q9bwy13x47iaqm6rmcwc1rb"; sha256 = "sha256-KwfGWc2mYhUP6SN4vhIO0eX0dasBRC2LSeLEOA/NqG8=";
fetchSubmodules = true;
}; };
nativeBuildInputs = [ nativeBuildInputs = [

9
pkgs/development/python-modules/mutag/default.nix
View file

@ -1,6 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchgit , fetchFromGitHub
, isPy3k , isPy3k
, pyparsing , pyparsing
}: }:
@ -10,10 +10,11 @@ buildPythonPackage {
version = "0.0.2-2ffa0258ca"; version = "0.0.2-2ffa0258ca";
disabled = ! isPy3k; disabled = ! isPy3k;
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/aroig/mutag.git"; owner = "aroig";
sha256 = "0axdnwdypfd74a9dnw0g25m16xx1yygyl828xy0kpj8gyqdc6gb1"; repo = "mutag";
rev = "2ffa0258cadaf79313241f43bf2c1caaf197d9c2"; rev = "2ffa0258cadaf79313241f43bf2c1caaf197d9c2";
sha256 = "sha256-YT3DGvYPyTuB70gg6p/3oXcTahEPcNuSIqe56xu3rSs=";
}; };
propagatedBuildInputs = [ pyparsing ]; propagatedBuildInputs = [ pyparsing ];

8
pkgs/development/python-modules/samplerate/default.nix
View file

@ -2,16 +2,18 @@
, buildPythonPackage , buildPythonPackage
, numpy , numpy
, pkgs , pkgs
, fetchFromGitHub
}: }:
buildPythonPackage { buildPythonPackage {
pname = "scikits.samplerate"; pname = "scikits.samplerate";
version = "0.3.3"; version = "0.3.3";
src = pkgs.fetchgit { src = fetchFromGitHub {
url = "https://github.com/cournape/samplerate"; owner = "cournape";
repo = "samplerate";
rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210"; rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210";
sha256 = "0mgic7bs5zv5ji05vr527jlxxlb70f9dg93hy1lzyz2plm1kf7gg"; sha256 = "sha256-7x03Q6VXfP9p8HCk15IDZ9HeqTyi5F1AlGX/otdh8VU=";
}; };
buildInputs = [ pkgs.libsamplerate ]; buildInputs = [ pkgs.libsamplerate ];

10
pkgs/development/python-modules/svg2tikz/default.nix
View file

@ -1,6 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchgit , fetchFromGitHub
, lxml , lxml
, isPy27 , isPy27
}: }:
@ -12,10 +12,12 @@ buildPythonPackage {
propagatedBuildInputs = [ lxml ]; propagatedBuildInputs = [ lxml ];
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/kjellmf/svg2tikz"; owner = "kjellmf";
sha256 = "429428ec435e53672b85cdfbb89bb8af0ff9f8238f5d05970729e5177d252d5f"; repo = "svg2tikz";
rev = "ad36f2c3818da13c4136d70a0fd8153acf8daef4"; rev = "ad36f2c3818da13c4136d70a0fd8153acf8daef4";
sha256 = "sha256-QpQo7ENeU2crhc37uJu4rw/5+COPXQWXBynlF30lLV8=";
fetchSubmodules = true;
}; };
meta = with lib; { meta = with lib; {

14
pkgs/development/tools/go-repo-root/default.nix
View file

@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchgit }: { lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
pname = "go-repo-root"; pname = "go-repo-root";
version = "20140911-${lib.strings.substring 0 7 rev}"; version = "unstable-2014-09-11";
rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
goPackagePath = "github.com/cstrahan/go-repo-root"; goPackagePath = "github.com/cstrahan/go-repo-root";
src = fetchgit { src = fetchFromGitHub {
inherit rev; owner = "cstrahan";
url = "https://github.com/cstrahan/go-repo-root"; repo = "go-repo-root";
sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4"; rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
sha256 = "sha256-5FVELoUq34KjBl1kzYpExDQFvH2PYQ+dbUOBLSe6n+Y=";
}; };
goDeps = ./deps.nix; goDeps = ./deps.nix;

14
pkgs/development/tools/gotags/default.nix
View file

@ -1,15 +1,15 @@
{ lib, buildGoPackage, fetchgit }: { lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
pname = "gotags"; pname = "gotags";
version = "20150803-${lib.strings.substring 0 7 rev}"; version = "unstable-2015-08-03";
rev = "be986a34e20634775ac73e11a5b55916085c48e7";
goPackagePath = "github.com/jstemmer/gotags"; goPackagePath = "github.com/jstemmer/gotags";
src = fetchgit { src = fetchFromGitHub {
inherit rev; owner = "jstemmer";
url = "https://github.com/jstemmer/gotags"; repo = "gotags";
sha256 = "071wyq90b06xlb3bb0l4qjz1gf4nnci4bcngiddfcxf2l41w1vja"; rev = "be986a34e20634775ac73e11a5b55916085c48e7";
sha256 = "sha256-Su7AA6HCdeZai8+yRSKzlrgXvsSEgrXGot2ABRL2PBw=";
}; };
} }

10
pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix
View file

@ -1,14 +1,14 @@
{ mkDerivation, base, containers, fetchgit, hedgehog, lib { mkDerivation, base, containers, fetchFromGitHub, hedgehog, lib
, optparse-applicative, parsec, template-haskell, text , optparse-applicative, parsec, template-haskell, text
}: }:
mkDerivation { mkDerivation {
pname = "dconf2nix"; pname = "dconf2nix";
version = "0.0.11"; version = "0.0.11";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/gvolpe/dconf2nix.git"; owner = "gvolpe";
sha256 = "1kv88bxi7l5kcm66m5y85b8fz1zsdshvw37k715g2biwa0an5s6f"; repo = "dconf2nix";
rev = "fe7e3d973caa87b1b706096aff3d670f65e39fda"; rev = "fe7e3d973caa87b1b706096aff3d670f65e39fda";
fetchSubmodules = true; sha256 = "sha256-zuhiFVA8LvFKOPMMvqFu+ofv0CrIl2pMZbPQE/tCaM8=";
}; };
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;

12
pkgs/development/tools/jd/default.nix
View file

@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchgit }: { lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
pname = "jd"; pname = "jd";
version = "0.3.1"; version = "0.3.1";
rev = "2729b5af166cfd72bd953ef8959b456c4db940fc";
goPackagePath = "github.com/tidwall/jd"; goPackagePath = "github.com/tidwall/jd";
src = fetchgit { src = fetchFromGitHub {
inherit rev; owner = "tidwall";
url = "https://github.com/tidwall/jd"; repo = "jd";
sha256 = "0dj4k38pf80dl77jns29vx2dj265s4ksg2q2s9n240b7b8z8mn5h"; rev = "2729b5af166cfd72bd953ef8959b456c4db940fc";
sha256 = "sha256-sNiKPlpnASJs0gKLpyfRxQjZRN9JaCvPoQ0gd9GYRDY=";
}; };
meta = with lib; { meta = with lib; {

10
pkgs/development/tools/literate-programming/Literate/default.nix
View file

@ -1,13 +1,15 @@
{ lib, stdenv, fetchgit, ldc, dub }: { lib, stdenv, fetchFromGitHub, ldc, dub }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "Literate"; pname = "Literate";
version = "unstable-2021-01-22"; version = "unstable-2021-01-22";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/zyedidia/Literate.git"; owner = "zyedidia";
repo = "Literate";
rev = "7004dffec0cff3068828514eca72172274fd3f7d"; rev = "7004dffec0cff3068828514eca72172274fd3f7d";
sha256 = "0x4xgrdskybaa7ssv81grmwyc1k167v3nwj320jvp5l59xxlbcvs"; sha256 = "sha256-erNFe0+FlrslEENyO/YxYQbmec0voK31UWr5qVt+nXQ=";
fetchSubmodules = true;
}; };
buildInputs = [ ldc dub ]; buildInputs = [ ldc dub ];

10
pkgs/development/tools/misc/ycmd/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchgit, cmake, llvmPackages, boost, python { stdenv, lib, fetchFromGitHub, cmake, llvmPackages, boost, python
, withGocode ? true, gocode , withGocode ? true, gocode
, withGodef ? true, godef , withGodef ? true, godef
, withGotools? true, gotools , withGotools? true, gotools
@ -12,10 +12,12 @@ stdenv.mkDerivation {
disabled = !python.isPy3k; disabled = !python.isPy3k;
# required for third_party directory creation # required for third_party directory creation
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/Valloric/ycmd.git"; owner = "Valloric";
repo = "ycmd";
rev = "9a6b86e3a156066335b678c328f226229746bae5"; rev = "9a6b86e3a156066335b678c328f226229746bae5";
sha256 = "1c5axdngxaxj5vc6lr8sxb99mr5adsm1dnjckaxc23kq78pc8cn7"; sha256 = "sha256-xzLELjp4DsG6mkzaFqpuquSa0uoaZWrYLrKr/mzrqrA=";
fetchSubmodules = true;
}; };
nativeBuildInputs = [ cmake ] nativeBuildInputs = [ cmake ]

11
pkgs/development/tools/rtags/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkg-config }: { stdenv, lib, fetchFromGitHub, cmake, llvmPackages, openssl, apple_sdk, emacs, pkg-config }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rtags"; pname = "rtags";
@ -8,11 +8,12 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ] ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ]
++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ];
src = fetchgit { src = fetchFromGitHub {
rev = "refs/tags/v${version}"; owner = "andersbakken";
repo = "rtags";
rev = "v${version}";
sha256 = "sha256-EJ5pC53S36Uu7lM6KuLvLN6MAyrQW/Yk5kPqZNS5m8c=";
fetchSubmodules = true; fetchSubmodules = true;
url = "https://github.com/andersbakken/rtags.git";
sha256 = "1iwvp7a69sj3wqjgcnyh581qrpicxzi2lfjkxqpabpyjkl5nk7hh";
# unicode file names lead to different checksums on HFS+ vs. other # unicode file names lead to different checksums on HFS+ vs. other
# filesystems because of unicode normalisation # filesystems because of unicode normalisation
postFetch = '' postFetch = ''

13
pkgs/development/tools/ws/default.nix
View file

@ -1,17 +1,16 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 { lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchgit }:
buildGoPackage rec { buildGoPackage rec {
pname = "ws"; pname = "ws";
version = "0.2.1"; version = "0.2.1";
rev = "e9404cb37e339333088b36f6a7909ff3be76931d";
goPackagePath = "github.com/hashrocket/ws"; goPackagePath = "github.com/hashrocket/ws";
src = fetchgit { src = fetchFromGitHub {
inherit rev; owner = "hashrocket";
url = "https://github.com/hashrocket/ws"; repo = "ws";
sha256 = "192slrz1cj1chzmfrl0d9ai8bq6s4w0iwpvxkhxb9krga7mkp9xb"; rev = "e9404cb37e339333088b36f6a7909ff3be76931d";
sha256 = "sha256-q6c761Evz7Q6nH1fHgEn2uCFokoN0OzqhyxIFn6mWqQ=";
}; };
meta = with lib; { meta = with lib; {

9
pkgs/misc/screensavers/alock/default.nix
View file

@ -1,14 +1,15 @@
{ lib, stdenv, fetchgit, pkg-config, autoreconfHook { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
, libX11, pam, libgcrypt, libXrender, imlib2 }: , libX11, pam, libgcrypt, libXrender, imlib2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "alock"; pname = "alock";
version = "unstable-2017-07-20"; version = "unstable-2017-07-20";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/Arkq/alock"; owner = "Arkq";
repo = "alock";
rev = "2035e1d4a2293432f5503e82d10f899232eb0f38"; rev = "2035e1d4a2293432f5503e82d10f899232eb0f38";
sha256 = "1by954fjn0ryqda89zlmq3gclakg3gz7zy1wjrbgw4lzsk538va6"; sha256 = "sha256-Rm00ytSfEv5Wljz4f/4bbyrK3sCV/oRUwz4DKx0pya8=";
}; };
PAM_DEFAULT_SERVICE = "login"; PAM_DEFAULT_SERVICE = "login";

9
pkgs/misc/screensavers/xtrlock-pam/default.nix
View file

@ -1,13 +1,14 @@
{ lib, stdenv, fetchgit, python2, pkg-config, xlibsWrapper, pam }: { lib, stdenv, fetchFromGitHub, python2, pkg-config, xlibsWrapper, pam }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "xtrlock-pam"; pname = "xtrlock-pam";
version = "3.4-post-20150909"; version = "3.4-post-20150909";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/aanatoly/xtrlock-pam"; owner = "aanatoly";
repo = "xtrlock-pam";
rev = "6f4920fcfff54791c0779057e9efacbbbbc05df6"; rev = "6f4920fcfff54791c0779057e9efacbbbbc05df6";
sha256 = "1z2wlhi5d05b18pvwz146kp0lkcc6z2mnilk01mk19hzbziyqmsc"; sha256 = "sha256-TFfs418fpjBrAJNGW8U3jE0K7jQkfL4vCquAViKkXPw=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

10
pkgs/os-specific/linux/firmware/rt5677/default.nix
View file

@ -1,15 +1,15 @@
{ lib, stdenv, fetchgit }: { lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "rt5677-firmware"; name = "rt5677-firmware";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/raphael/linux-samus"; owner = "raphael";
repo = "linux-samus";
rev = "995de6c2093797905fbcd79f1a3625dd3f50be37"; rev = "995de6c2093797905fbcd79f1a3625dd3f50be37";
sha256 = "0a6lz9wadm47cmva136q6wd0lw03bmymf9ispnzb091a7skwacry"; sha256 = "sha256-PjPFpz4qJLC+vTomV31dA3AKGjfYjKB2ZYfUpnj61Cg=";
}; };
installPhase = '' installPhase = ''
mkdir -p $out/lib/firmware mkdir -p $out/lib/firmware
cp ./firmware/rt5677_elf_vad $out/lib/firmware cp ./firmware/rt5677_elf_vad $out/lib/firmware

10
pkgs/os-specific/linux/lightum/default.nix
View file

@ -1,12 +1,14 @@
{ lib, stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }: { lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "lightum"; pname = "lightum";
version = "unstable-2014-06-07"; version = "unstable-2014-06-07";
src = fetchgit {
url = "https://github.com/poliva/lightum"; src = fetchFromGitHub {
owner = "poliva";
repo = "lightum";
rev = "123e6babe0669b23d4c1dfa5511088608ff2baa8"; rev = "123e6babe0669b23d4c1dfa5511088608ff2baa8";
sha256 = "01x24rcrkgksyvqpgkr9zafg3jgs8nqng8yf0hx0kbmcimar8dbp"; sha256 = "sha256-dzWUVY2srgk6BM6jZ7FF+snxnPopz3fx9nq+mVkmogc=";
}; };
buildInputs = [ buildInputs = [

9
pkgs/os-specific/linux/usermount/default.nix
View file

@ -1,13 +1,14 @@
{ lib, stdenv, fetchgit, pkg-config, dbus, libnotify, udisks2, gdk-pixbuf }: { lib, stdenv, fetchFromGitHub, pkg-config, dbus, libnotify, udisks2, gdk-pixbuf }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "usermount"; pname = "usermount";
version = "0.1"; version = "0.1";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/tom5760/usermount.git"; owner = "tom5760";
repo = "usermount";
rev = "0d6aba3c1f8fec80de502f5b92fd8b28041cc8e4"; rev = "0d6aba3c1f8fec80de502f5b92fd8b28041cc8e4";
sha256 = "0gpp0vwiwr7kgbhh26jspv3255662mnvnav6g8i2h0qxar8hf8w2"; sha256 = "sha256-giMHUVYdAygiemYru20VxpQixr5aGgHhevNkHvkG9z4=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

24
pkgs/servers/brickd/default.nix
View file

@ -1,24 +1,24 @@
{ lib, stdenv, fetchgit, libusb1, pkg-config, pmutils, udev} : { lib, stdenv, fetchFromGitHub, libusb1, pkg-config, pmutils, udev} :
let let
version = "2.1.1";
version = "2.1.1"; daemonlib = fetchFromGitHub {
daemonlib = fetchgit { owner = "Tinkerforge";
url = "https://github.com/Tinkerforge/daemonlib.git"; repo = "daemonlib";
rev = "refs/tags/brickd-${version}"; rev = "brickd-${version}";
sha256 = "097kaz7d0rzg0ijvcna3y620k3m5fgxpqsac5gbhah8pd7vlj1a4"; sha256 = "sha256-0HhuC4r1S4NJa2FSJa7+fNCfcoRTBckikYbGSE+2FbE=";
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "brickd"; pname = "brickd";
inherit version; inherit version;
src = fetchgit { src = fetchFromGitHub {
url = "git://github.com/Tinkerforge/brickd.git"; owner = "Tinkerforge";
rev = "refs/tags/v${version}"; repo = "brickd";
sha256 = "0m2q01sbgf8z4559jpr6k3jivb8x98vxv1fhgx8nfcjbwz1q83gb"; rev = "v${version}";
sha256 = "sha256-6w2Ew+dLMmdRf9CF3TdKHa0d5ZgmX5lKIR+5t3QAWFQ=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

11
pkgs/servers/ps3netsrv/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit }: { lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "ps3netsrv"; pname = "ps3netsrv";
@ -6,11 +6,12 @@ stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/dirkvdb/ps3netsrv--"; owner = "dirkvdb";
fetchSubmodules = true; repo = "ps3netsrv--";
rev = "e54a66cbf142b86e2cffc1701984b95adb921e81"; rev = "e54a66cbf142b86e2cffc1701984b95adb921e81";
sha256 = "09hvmfzqy2jckpsml0z1gkcnar8sigmgs1q66k718fph2d3g54sa"; sha256 = "sha256-SpPyRhPwOhTONAYH/eqLGmVl2XzhA1r1nUwKj7+rGyY=";
fetchSubmodules = true;
}; };
buildPhase = "make CXX=$CXX"; buildPhase = "make CXX=$CXX";

14
pkgs/servers/rippled/data-api.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchgit, nodePackages }: { lib, fetchFromGitHub, nodePackages }:
with lib; with lib;
@ -6,13 +6,13 @@ let
np = nodePackages.override { generated = ./package.nix; self = np; }; np = nodePackages.override { generated = ./package.nix; self = np; };
in nodePackages.buildNodePackage rec { in nodePackages.buildNodePackage rec {
pname = "ripple-data-api"; pname = "ripple-data-api";
version = lib.strings.substring 0 7 rev; version = "unstable-2015-03-26";
rev = "c56b860105f36c1c44ae011189d495272648c589";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/ripple/ripple-data-api.git"; owner = "ripple";
inherit rev; repo = "ripple-data-api";
sha256 = "1iygp26ilradxj268g1l2y93cgrpchqwn71qdag67lv273dbq48m"; rev = "c56b860105f36c1c44ae011189d495272648c589";
sha256 = "sha256-QEBdYdW55sAz6jshIAr2dSfXuqE/vqA2/kBeoxf75a8=";
}; };
deps = (filter (v: nixType v == "derivation") (attrValues np)); deps = (filter (v: nixType v == "derivation") (attrValues np));

9
pkgs/servers/scylladb/default.nix
View file

@ -1,6 +1,6 @@
{ {
lib, lib,
fetchgit, fetchFromGitHub,
python3Packages, python3Packages,
pkg-config, pkg-config,
gcc8Stdenv, gcc8Stdenv,
@ -34,10 +34,11 @@ gcc8Stdenv.mkDerivation {
pname = "scylladb"; pname = "scylladb";
version = "3.0.5"; version = "3.0.5";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/scylladb/scylla.git"; owner = "scylladb";
repo = "scylla";
rev = "403f66ecad6bc773712c69c4a80ebd172eb48b13"; rev = "403f66ecad6bc773712c69c4a80ebd172eb48b13";
sha256 = "14mg0kzpkrxvwqyiy19ndy4rsc7s5gnv2gwd3xdwm1lx1ln8ywsi"; sha256 = "sha256-UXOPLA2dhspbH40/se0r+jCdiW82BR895rvnef8Er5I=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

13
pkgs/servers/web-apps/morty/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildGoPackage, fetchgit }: { lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
pname = "morty"; pname = "morty";
@ -6,10 +6,11 @@ buildGoPackage rec {
goPackagePath = "github.com/asciimoo/morty"; goPackagePath = "github.com/asciimoo/morty";
src = fetchgit { src = fetchFromGitHub {
owner = "asciimoo";
repo = "morty";
rev = "v${version}"; rev = "v${version}";
url = "https://github.com/asciimoo/morty"; sha256 = "sha256-NWfsqJKJcRPKR8gWQbgal1JsenDesczPcz/+uzhtefM=";
sha256 = "1wvrdlwbpzizfg7wrcfyf1x6qllp3aw425n88z516wc9jalfqrrm";
}; };
goDeps = ./deps.nix; goDeps = ./deps.nix;
@ -37,6 +38,6 @@ buildGoPackage rec {
* No Caching/Etag * No Caching/Etag
* Supports GET/POST forms and IFrames * Supports GET/POST forms and IFrames
* Optional HMAC URL verifier key to prevent service abuse * Optional HMAC URL verifier key to prevent service abuse
''; '';
}; };
} }

11
pkgs/tools/admin/bash-my-aws/default.nix
View file

@ -3,19 +3,20 @@
, awscli , awscli
, jq , jq
, unixtools , unixtools
, fetchgit , fetchFromGitHub
, installShellFiles , installShellFiles
, bashInteractive , bashInteractive
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bash-my-aws"; pname = "bash-my-aws";
version = "20200111"; version = "unstable-2020-01-11";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/bash-my-aws/bash-my-aws"; owner = "bash-my-aws";
repo = "bash-my-aws";
rev = "5a97ce2c22affca1299022a5afa109d7b62242ba"; rev = "5a97ce2c22affca1299022a5afa109d7b62242ba";
sha256 = "459bda8b244af059d96c7c8b916cf956b01cb2732d1c2888a3ae06a4d660bea6"; sha256 = "sha256-RZvaiyRK8FnZbHyLkWz5VrAcsnMtHCiIo64GpNZgvqY=";
}; };
dontConfigure = true; dontConfigure = true;

9
pkgs/tools/audio/gvolicon/default.nix
View file

@ -1,13 +1,14 @@
{ lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }: { lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchFromGitHub, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "gvolicon"; pname = "gvolicon";
version = "unstable-2014-04-28"; version = "unstable-2014-04-28";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/Unia/gvolicon"; owner = "Unia";
repo = "gvolicon";
rev = "0d65a396ba11f519d5785c37fec3e9a816217a07"; rev = "0d65a396ba11f519d5785c37fec3e9a816217a07";
sha256 = "1sr9wyy7w898vq63yd003yp3k66hd4vm8b0qsm9zvmwmpiz4wvln"; sha256 = "sha256-lm5OfryV1/1T1RgsVDdp0Jg5rh8AND8M3ighfrznKes=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

12
pkgs/tools/cd-dvd/vobsub2srt/default.nix
View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }: { lib, stdenv, fetchFromGitHub, cmake, libtiff, pkg-config, tesseract }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vobsub2srt"; pname = "vobsub2srt";
version = "unstable-2014-08-17"; version = "unstable-2014-08-17";
rev = "a6abbd61127a6392d420bbbebdf7612608c943c2";
src = fetchgit { src = fetchFromGitHub {
inherit rev; owner = "ruediger";
url = "https://github.com/ruediger/VobSub2SRT.git"; repo = "VobSub2SRT";
sha256 = "1rpanrv8bgdh95v2320qbd44xskncvq6y84cbbfc86gw0qxpd9cb"; rev = "a6abbd61127a6392d420bbbebdf7612608c943c2";
sha256 = "sha256-i6V2Owb8GcTcWowgb/BmdupOSFsYiCF2SbC9hXa26uY=";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];

18
pkgs/tools/filesystems/go-mtpfs/default.nix
View file

@ -1,20 +1,20 @@
{ pkg-config, libusb1, buildGoPackage, fetchgit }: { pkg-config, libusb1, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
pname = "go-mtpfs"; pname = "go-mtpfs";
version = "2018-02-09"; version = "unstable-2018-02-09";
rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb";
goPackagePath = "github.com/hanwen/go-mtpfs"; goPackagePath = "github.com/hanwen/go-mtpfs";
src = fetchFromGitHub {
owner = "hanwen";
repo = "go-mtpfs";
rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb";
sha256 = "sha256-sz+ikhZGwSIAI2YBSQKURF3WXB8dHgQ/C/dbkXwrDSg=";
};
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ libusb1 ]; buildInputs = [ libusb1 ];
src = fetchgit {
inherit rev;
url = "https://github.com/hanwen/go-mtpfs";
sha256 = "0a0d5dy92nzp1czh87hx3xfdcpa4jh14j0b64c025ha62s9a4gxk";
};
goDeps = ./deps.nix; goDeps = ./deps.nix;
} }

15
pkgs/tools/misc/azure-vhd-utils/default.nix
View file

@ -1,17 +1,16 @@
# This file was generated by go2nix. { lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchgit }:
buildGoPackage rec { buildGoPackage rec {
pname = "azure-vhd-utils"; pname = "azure-vhd-utils";
version = "20160614-${lib.strings.substring 0 7 rev}"; version = "unstable-2016-06-14";
rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8";
goPackagePath = "github.com/Microsoft/azure-vhd-utils"; goPackagePath = "github.com/Microsoft/azure-vhd-utils";
src = fetchgit { src = fetchFromGitHub {
inherit rev; owner = "Microsoft";
url = "https://github.com/Microsoft/azure-vhd-utils"; repo = "azure-vhd-utils";
sha256 = "0b9kbavlb92rhnb1swwq8bdn4l9a994rmf1ywyfq4yc0kd3gnhgh"; rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8";
sha256 = "sha256-8EH7RpuAeYKd5z64mklKKlFi20KYcx2WhVmkRbdaMy0=";
}; };
goDeps = ./deps.nix; goDeps = ./deps.nix;

16
pkgs/tools/misc/gawp/default.nix
View file

@ -1,18 +1,16 @@
{ lib, buildGoPackage, fetchgit }: { lib, buildGoPackage, fetchFromGitHub }:
with builtins;
buildGoPackage rec { buildGoPackage rec {
pname = "gawp"; pname = "gawp";
version = "20160121-${lib.strings.substring 0 7 rev}"; version = "unstable-2016-01-21";
rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f";
goPackagePath = "github.com/martingallagher/gawp"; goPackagePath = "github.com/martingallagher/gawp";
src = fetchgit { src = fetchFromGitHub {
inherit rev; owner = "martingallagher";
url = "https://github.com/martingallagher/gawp"; repo = "gawp";
sha256 = "0bbmbb1xxdgvqvg1ssn9d4j213li7bbbx3y42iz4fs10xv7x4r0c"; rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f";
sha256 = "sha256-DGTSz+4gaEd+FMSPvtY6kY4gJGnJah3exvu13sNadS0=";
}; };
goDeps = ./deps.nix; goDeps = ./deps.nix;

14
pkgs/tools/misc/gosu/default.nix
View file

@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchgit }: { lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
pname = "gosu"; pname = "gosu";
version = "2017-05-09"; version = "unstable-2017-05-09";
rev = "e87cf95808a7b16208515c49012aa3410bc5bba8";
goPackagePath = "github.com/tianon/gosu"; goPackagePath = "github.com/tianon/gosu";
src = fetchgit { src = fetchFromGitHub {
inherit rev; owner = "tianon";
url = "https://github.com/tianon/gosu"; repo = "gosu";
sha256 = "1qp1cfx0hrr4qlnh7rhjb4xlxv9697flmgzzl6jcdkrpk1f0bz8m"; rev = "e87cf95808a7b16208515c49012aa3410bc5bba8";
sha256 = "sha256-Ff0FXJg3z8akof+/St1JJu1OO1kS5gMtxSRnCLpj4eI=";
}; };
goDeps = ./deps.nix; goDeps = ./deps.nix;

46
pkgs/tools/misc/grub/trusted.nix
View file

@ -1,5 +1,20 @@
{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python2, autoconf, automake { lib
, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2 , stdenv
, fetchurl
, fetchFromGitHub
, fetchpatch
, autogen
, flex
, bison
, python2
, autoconf
, automake
, gettext
, ncurses
, libusb-compat-0_1
, freetype
, qemu
, lvm2
, for_HP_laptop ? false , for_HP_laptop ? false
}: }:
@ -32,17 +47,15 @@ stdenv.mkDerivation rec {
pname = "trustedGRUB2"; pname = "trustedGRUB2";
inherit version; inherit version;
src = if for_HP_laptop src = fetchFromGitHub {
then fetchgit { owner = "Sirrix-AG";
url = "https://github.com/Sirrix-AG/TrustedGRUB2"; repo = "TrustedGRUB2";
rev = "ab483d389bda3115ca0ae4202fd71f2e4a31ad41"; rev = version;
sha256 = "1760d9hsnqkdvlag9nn8f613mqhnsxmidgvdkpmb37b0yi7p6lhz"; sha256 =
} if for_HP_laptop
else fetchgit { then "sha256-H1JzT/RgnbHqnW2/FmvXFuI6gnHI2vQU3W1iq2FqwJw="
url = "https://github.com/Sirrix-AG/TrustedGRUB2"; else "sha256-k8DGHjTIpnjWw7GNN2kyR8rRl2MAq1xkfOndd0znLns=";
rev = "1ff54a5fbe02ea01df5a7de59b1e0201e08d4f76"; };
sha256 = "0yrfwx67gpg9gij5raq0cfbx3jj769lkg3diqgb7i9n86hgcdh4k";
};
nativeBuildInputs = [ autogen flex bison python2 autoconf automake ]; nativeBuildInputs = [ autogen flex bison python2 autoconf automake ];
buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ] buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ]
@ -91,9 +104,10 @@ stdenv.mkDerivation rec {
]; ];
# save target that grub is compiled for # save target that grub is compiled for
grubTarget = if inPCSystems grubTarget =
then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc" if inPCSystems
else ""; then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc"
else "";
doCheck = false; doCheck = false;
# On -j16 races with early header creation: # On -j16 races with early header creation:

21
pkgs/tools/misc/i3cat/default.nix
View file

@ -1,17 +1,24 @@
{ lib, buildGoPackage, fetchgit }: { lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
pname = "i3cat"; pname = "i3cat";
version = "20150321-${lib.strings.substring 0 7 rev}"; version = "1.0";
rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576";
goPackagePath = "github.com/vincent-petithory/i3cat"; goPackagePath = "github.com/vincent-petithory/i3cat";
src = fetchgit { src = fetchFromGitHub {
inherit rev; owner = "vincent-petithory";
url = "https://github.com/vincent-petithory/i3cat"; repo = "i3cat";
sha256 = "1xlm5c9ajdb71985nq7hcsaraq2z06przbl6r4ykvzi8w2lwgv72"; rev = "v${version}";
sha256 = "sha256-BxiiYzSjvXAMUQSUTKviLvrmGjkCLW6QPrgBBHvvF+Q=";
}; };
goDeps = ./deps.nix; goDeps = ./deps.nix;
meta = with lib; {
description = "combine multiple i3bar JSON inputs into one to forward to i3bar";
homepage = "https://vincent-petithory.github.io/i3cat/";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
} }

11
pkgs/tools/misc/sdl-jstest/default.nix
View file

@ -1,14 +1,15 @@
{ lib, stdenv, fetchgit, cmake, pkg-config, SDL, SDL2, ncurses, docbook_xsl, git }: { lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL, SDL2, ncurses, docbook_xsl, git }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "sdl-jstest"; pname = "sdl-jstest";
version = "2018-06-15"; version = "2018-06-15";
# Submodules src = fetchFromGitHub {
src = fetchgit { owner = "Grumbel";
url = "https://github.com/Grumbel/sdl-jstest"; repo = "sdl-jstest";
rev = "aafbdb1ed3e687583037ba55ae88b1210d6ce98b"; rev = "aafbdb1ed3e687583037ba55ae88b1210d6ce98b";
sha256 = "0p4cjzcq0bbkzad19jwdklylqhq2q390q7dpg8bfzl2rwls883rk"; sha256 = "sha256-Mw+ENOVZ0O8WercdDNLAAkNMPZ2NyxSa+nMtgNmXjFw=";
fetchSubmodules = true;
}; };
buildInputs = [ SDL SDL2 ncurses ]; buildInputs = [ SDL SDL2 ncurses ];

18
pkgs/tools/misc/upower-notify/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildGoPackage, fetchgit }: { lib, buildGoPackage, fetchFromGitHub }:
# To use upower-notify, the maintainer suggests adding something like this to your configuration.nix: # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix:
# #
@ -8,16 +8,22 @@
# ''; # '';
buildGoPackage rec { buildGoPackage rec {
pname = "upower-notify"; pname = "upower-notify";
version = "20160310-${lib.strings.substring 0 7 rev}"; version = "unstable-2016-03-10";
rev = "14c581e683a7e90ec9fa6d409413c16599a5323c";
goPackagePath = "github.com/omeid/upower-notify"; goPackagePath = "github.com/omeid/upower-notify";
src = fetchgit { src = fetchFromGitHub {
inherit rev; owner = "omeid";
url = "https://github.com/omeid/upower-notify"; repo = "upower-notify";
rev = "14c581e683a7e90ec9fa6d409413c16599a5323c";
sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw"; sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw";
}; };
goDeps = ./deps.nix; goDeps = ./deps.nix;
meta = with lib; {
description = "simple tool to give you Desktop Notifications about your battery";
homepage = "https://github.com/omeid/upower-notify";
maintainers = with maintainers; [ kamilchm ];
};
} }

11
pkgs/tools/networking/bud/default.nix
View file

@ -1,14 +1,15 @@
{ stdenv, lib, fetchgit, python2, util-linux }: { stdenv, lib, fetchFromGitHub, python2, util-linux }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "bud"; pname = "bud";
version = "0.34.1"; version = "0.34.1";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/indutny/bud.git"; owner = "indutny";
repo = "bud";
rev = "b112852c9667632f692d2ce3dcd9a8312b61155a"; rev = "b112852c9667632f692d2ce3dcd9a8312b61155a";
sha256 = "08yr6l4lc2m6rng06253fcaznf6sq0v053wfr8bbym42c32z0xdh"; sha256 = "sha256-sHXwxWCCVL8Wyo6PAjbA2jj7FXOjCAOezaYKRgk12SM=";
fetchSubmodules = true;
}; };
nativeBuildInputs = [ nativeBuildInputs = [

21
pkgs/tools/networking/s3gof3r/default.nix
View file

@ -1,17 +1,24 @@
{ lib, buildGoPackage, fetchgit }: { lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
pname = "s3gof3r"; pname = "s3gof3r";
version = "20151109-${lib.strings.substring 0 7 rev}"; version = "0.5.0";
rev = "31603a0dc94aefb822bfe2ceea75a6be6013b445";
goPackagePath = "github.com/rlmcpherson/s3gof3r"; goPackagePath = "github.com/rlmcpherson/s3gof3r";
src = fetchgit { src = fetchFromGitHub {
inherit rev; owner = "rlmcpherson";
url = "https://github.com/rlmcpherson/s3gof3r"; repo = "s3gof3r";
sha256 = "10banc8hnhxpsdmlkf9nc5fjkh1349bgpd9k7lggw3yih1rvmh7k"; rev = "v${version}";
sha256 = "sha256-88C6c4DRD/4ePTO1+1YiI8ApXWE2uUlr07dDCxGzaoE=";
}; };
goDeps = ./deps.nix; goDeps = ./deps.nix;
meta = with lib; {
description = "Fast, concurrent, streaming access to Amazon S3, including gof3r, a CLI";
homepage = "https://pkg.go.dev/github.com/rlmcpherson/s3gof3r";
maintainers = with maintainers; [ ];
license = licenses.mit;
};
} }

23
pkgs/tools/networking/ua/default.nix
View file

@ -1,19 +1,19 @@
{ lib, buildGoPackage, fetchgit { lib, buildGoPackage, fetchFromGitHub
, pkg-config , pkg-config
, glib, libxml2 , glib, libxml2
}: }:
buildGoPackage rec { buildGoPackage rec {
pname = "ua-unstable"; pname = "ua";
version = "2017-02-24"; version = "unstable-2017-02-24";
rev = "325dab92c60e0f028e55060f0c288aa70905fb17";
goPackagePath = "github.com/sloonz/ua"; goPackagePath = "github.com/sloonz/ua";
src = fetchgit { src = fetchFromGitHub {
inherit rev; owner = "sloonz";
url = "https://github.com/sloonz/ua.git"; repo = "ua";
sha256 = "0452qknc8km9495324g6b5ja3shvk8jl7aa9nrjhdylf09dp2nif"; rev = "325dab92c60e0f028e55060f0c288aa70905fb17";
sha256 = "sha256-LlpxWwKO+gZltkmpQyWaG+qhZFnmETFKIqlOxOzEohA=";
}; };
goDeps = ./deps.nix; goDeps = ./deps.nix;
@ -21,11 +21,10 @@ buildGoPackage rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib libxml2 ]; buildInputs = [ glib libxml2 ];
meta = { meta = with lib; {
homepage = "https://github.com/sloonz/ua"; homepage = "https://github.com/sloonz/ua";
license = lib.licenses.isc; license = licenses.isc;
description = "Universal Aggregator"; description = "Universal Aggregator";
platforms = lib.platforms.unix; maintainers = with maintainers; [ ttuegel ];
maintainers = with lib.maintainers; [ ttuegel ];
}; };
} }

13
pkgs/tools/networking/waitron/default.nix
View file

@ -1,17 +1,16 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 { lib, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }:
{ lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec { buildGoPackage rec {
pname = "waitron"; pname = "waitron";
version = "unstable-2020-01-24"; version = "unstable-2020-01-24";
rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6";
goPackagePath = "github.com/ns1/waitron"; goPackagePath = "github.com/ns1/waitron";
src = fetchgit { src = fetchFromGitHub {
inherit rev; owner = "ns1";
url = "https://github.com/ns1/waitron"; repo = "waitron";
sha256 = "0lgw37iq1cvg3mqc94nzf0027mvv721ay8x6dw3fc814ww8a2hb6"; rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6";
sha256 = "sha256-ZkGhEOckIOYGb6Yjr4I4e9cjAHDfksRwHW+zgOMZ/FE=";
}; };
patches = [ patches = [

9
pkgs/tools/security/tpm-luks/default.nix
View file

@ -1,13 +1,14 @@
{ lib, stdenv, fetchgit, autoreconfHook, gawk, trousers, cryptsetup, openssl }: { lib, stdenv, fetchFromGitHub, autoreconfHook, gawk, trousers, cryptsetup, openssl }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "tpm-luks"; pname = "tpm-luks";
version = "unstable-2015-07-11"; version = "unstable-2015-07-11";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/momiji/tpm-luks"; owner = "momiji";
repo = "tpm-luks";
rev = "c9c5b7fdddbcdac1cd4d2ea6baddd0617cc88ffa"; rev = "c9c5b7fdddbcdac1cd4d2ea6baddd0617cc88ffa";
sha256 = "1ms2v57f13r9km6mvf9rha5ndmlmjvrz3mcikai6nzhpj0nrjz0w"; sha256 = "sha256-HHyZLZAXfmuimpHV8fOWldZmi4I5uV1NnSmP4E7ZQtc=";
}; };
patches = [ patches = [

9
pkgs/tools/system/das_watchdog/default.nix
View file

@ -1,13 +1,14 @@
{ lib, stdenv, fetchgit, libgtop, xmessage, which, pkg-config }: { lib, stdenv, fetchFromGitHub, libgtop, xmessage, which, pkg-config }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "das_watchdog"; pname = "das_watchdog";
version = "unstable-2015-09-12"; version = "unstable-2015-09-12";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/kmatheussen/das_watchdog.git"; owner = "kmatheussen";
repo = "das_watchdog";
rev = "5ac0db0b98e5b4e690aca0aa7fb6ec60ceddcb06"; rev = "5ac0db0b98e5b4e690aca0aa7fb6ec60ceddcb06";
sha256 = "02y1vfb3wh4908xjj1kpyf8kgxk29x8dw7yl3pnl220qz2gi99vr"; sha256 = "sha256-eacUn/gYCEHtHdQf3lBPYvY3kfN3Bik7AolAPpbbwQs=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

22
pkgs/tools/text/codesearch/default.nix
View file

@ -1,24 +1,22 @@
# This file was generated by go2nix. { lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoPackage, fetchgit }:
buildGoPackage rec { buildGoPackage rec {
pname = "codesearch"; pname = "codesearch";
version = "20150717-${lib.strings.substring 0 7 rev}"; version = "1.0.0";
rev = "a45d81b686e85d01f2838439deaf72126ccd5a96";
goPackagePath = "github.com/google/codesearch"; goPackagePath = "github.com/google/codesearch";
src = fetchgit { src = fetchFromGitHub {
inherit rev; owner = "google";
url = "https://github.com/google/codesearch"; repo = "codesearch";
sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny"; rev = "v${version}";
sha256 = "sha256-3kJ/JT89krbIvprWayBL4chUmT77Oa1W13UNCr4fe4k=";
}; };
meta = { meta = with lib; {
description = "Fast, indexed regexp search over large file trees"; description = "Fast, indexed regexp search over large file trees";
homepage = "https://github.com/google/codesearch"; homepage = "https://github.com/google/codesearch";
license = [ lib.licenses.bsd3 ]; license = [ licenses.bsd3 ];
maintainers = [ lib.maintainers.bennofs ]; maintainers = with maintainers; [ bennofs ];
platforms = lib.platforms.unix;
}; };
} }