Unverified Commit 4348e364 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #164248 from Stunkymonkey/treewide-fetchFromGitHub-2

parents 86e74a4b 10d595ef

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

+5 −4
Original line number Diff line number Diff line 
{ lib, stdenv, fetchgit, pkg-config, linkFarm, lightdm-enso-os-greeter

{ lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter

, dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs

, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
@@ -6,10 +6,11 @@ stdenv.mkDerivation { 
  version = "0.2.1";

  pname = "lightdm-enso-os-greeter";



  src = fetchgit {

    url = "https://github.com/nick92/Enso-OS";

  src = fetchFromGitHub {

    owner = "nick92";

    repo = "Enso-OS";

    rev = "ed48330bfd986072bd82ac542ed8f8a7365c6427";

    sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz";

    sha256 = "sha256-v79J5KyjeJ99ifN7nK/B+J7f292qDAEHsmsHLAMKVYY=";

  };



  patches = [

pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix

+4 −3
Original line number Diff line number Diff line 
let

  pkgs = import ../../../../.. { };



  src = pkgs.fetchgit {

    url = "https://github.com/nix-community/emacs2nix.git";

    fetchSubmodules = true;

  src = pkgs.fetchFromGitHub {

    owner = "nix-community";

    repo = "emacs2nix";

    rev = "2e8d2c644397be57455ad32c2849f692eeac7797";

    sha256 = "sha256-qnOYDYHAQ+r5eegKP9GqHz5R2ig96B2W7M+uYa1ti9M=";

    fetchSubmodules = true;

  };

in

pkgs.mkShell {

pkgs/applications/misc/mop/default.nix

+8 −8
Original line number Diff line number Diff line 
{ lib, buildGoPackage, fetchgit }:

{ lib, buildGoPackage, fetchFromGitHub }:



buildGoPackage rec {

  pname = "mop";

  version = "0.2.0";



  src = fetchFromGitHub {

    owner = "mop-tracker";

    repo = "mop";

    rev = "bc666ec165d08b43134f7ec0bf29083ad5466243";

    sha256 = "sha256-fX7G4M3gfv31Eb2HChTY4RfVF2U92000U4ZnFNML5X4=";

  };



  goPackagePath = "github.com/michaeldv/mop";

  goDeps = ./deps.nix;
@@ -16,12 +22,6 @@ buildGoPackage rec { 
    mv cmd mop

  '';



  src = fetchgit {

    inherit rev;

    url = "https://github.com/mop-tracker/mop";

    sha256 = "0zp51g9i8rw6acs4vnrxclbxa5z1v0a0m1xx27szszp0rphcczkx";

  };



  meta = with lib; {

    description = "Simple stock tracker implemented in go";

    homepage =  "https://github.com/mop-tracker/mop";

pkgs/applications/misc/nix-tour/default.nix

+5 −4
Original line number Diff line number Diff line 
{ lib, stdenv, fetchgit, electron, runtimeShell } :

{ lib, stdenv, fetchFromGitHub, electron, runtimeShell } :



stdenv.mkDerivation rec {

  pname = "nix-tour";
@@ -6,10 +6,11 @@ stdenv.mkDerivation rec { 


  buildInputs = [ electron ];



  src = fetchgit {

    url = "https://github.com/nixcloud/tour_of_nix";

  src = fetchFromGitHub {

    owner = "nixcloud";

    repo = "tour_of_nix";

    rev = "v${version}";

    sha256 = "09b1vxli4zv1nhqnj6c0vrrl51gaira94i8l7ww96fixqxjgdwvb";

    sha256 = "sha256-a/P2ZMc9OpM4PxRFklSO6oVCc96AGWkxtGF/EmnfYSU=";

  };



  installPhase = ''

pkgs/applications/misc/tpmmanager/default.nix

+6 −5
Original line number Diff line number Diff line 
{ lib, stdenv, fetchgit, qt4, qmake4Hook, trousers }:

{ lib, stdenv, fetchFromGitHub, qt4, qmake4Hook, trousers }:



stdenv.mkDerivation rec {

  version = "0.8.1";

  pname = "tpmmanager";



  src = fetchgit {

    url = "https://github.com/Sirrix-AG/TPMManager";

    rev = "9f989206635a6d2c1342576c90fa73eb239519cd";

    sha256 = "24a606f88fed67ed0d0e61dc220295e9e1ab8db3ef3d028fa34b04ff30652d8e";

  src = fetchFromGitHub {

    owner = "Rohde-Schwarz";

    repo = "TPMManager";

    rev = "v${version}";

    sha256 = "sha256-JKYG+I/tZ+0NDmHcIgKV6eGrjbPvPQKPo0sE/zBlLY4=";

  };



  nativeBuildInputs = [ qmake4Hook ];