diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-11-19 17:09:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-19 17:09:37 +0100 |
| commit | b95292072fd878d1cba28cd99aedfad3e2e8ccb0 (patch) | |
| tree | df6f81a6700f5b549d5a6ee896e96a9af3cb75f1 /pkgs/applications/office | |
| parent | 788fceee452317242792f0af9af30f4d7faccfde (diff) | |
| parent | a76d49eaf8e4ebac1d32e124e3171dd03d96c12f (diff) | |
| download | nixpkgs-b95292072fd878d1cba28cd99aedfad3e2e8ccb0.tar nixpkgs-b95292072fd878d1cba28cd99aedfad3e2e8ccb0.tar.gz nixpkgs-b95292072fd878d1cba28cd99aedfad3e2e8ccb0.tar.bz2 nixpkgs-b95292072fd878d1cba28cd99aedfad3e2e8ccb0.tar.lz nixpkgs-b95292072fd878d1cba28cd99aedfad3e2e8ccb0.tar.xz nixpkgs-b95292072fd878d1cba28cd99aedfad3e2e8ccb0.tar.zst nixpkgs-b95292072fd878d1cba28cd99aedfad3e2e8ccb0.zip | |
Merge pull request #144241 from Stunkymonkey/applications-github-1
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/ib/controller/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/office/mytetra/default.nix | 17 |
2 files changed, 16 insertions, 13 deletions
diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix index 8d241ea8303..db0e3c55737 100644 --- a/pkgs/applications/office/ib/controller/default.nix +++ b/pkgs/applications/office/ib/controller/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, unzip, jdk, ib-tws, xpra }: +{ lib, stdenv, fetchFromGitHub, unzip, jdk, ib-tws, xpra }: stdenv.mkDerivation rec { version = "2.14.0"; pname = "ib-controller"; - src = fetchurl { - url = "https://github.com/ib-controller/ib-controller/archive/${version}.tar.gz"; - sha256 = "17a8bcgg9z3b4y38k035hm2lgvhmf8srlz59c7n2q3fdw2i95i68"; + src = fetchFromGitHub { + owner = "ib-controller"; + repo = "ib-controller"; + rev = version; + sha256 = "sha256-R175CKb3uErjBNe73HEFMI+bNmmuH2nWGraCSh5bXwc="; }; nativeBuildInputs = [ unzip ]; @@ -148,7 +150,7 @@ stdenv.mkDerivation rec { fi EOF chmod u+x $out/bin/ib-gw-c - ''; + ''; meta = with lib; { diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index cb90af5244c..5ffd178b055 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -1,13 +1,14 @@ -{ lib, mkDerivation, fetchurl, qmake, qtsvg, makeWrapper, xdg-utils }: +{ lib, mkDerivation, fetchFromGitHub, qmake, qtsvg, makeWrapper, xdg-utils }: -let - version = "1.44.55"; -in mkDerivation { +mkDerivation rec { pname = "mytetra"; - inherit version; - src = fetchurl { - url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz"; - sha256 = "13lmfvschm1xwr0ys2ykhs0bb83m2f39rk1jdd7zf8yxlqki4i6l"; + version = "1.44.55"; + + src = fetchFromGitHub { + owner = "xintrea"; + repo = "mytetra_dev"; + rev = "v.${version}"; + sha256 = "sha256-jQXnDoLkqbDZxfsYKPDsTOE7p/BFeA8wEznpbkRVGdw="; }; nativeBuildInputs = [ qmake makeWrapper ]; |