diff --git a/docs/src/api/extensions/fetchers.md b/docs/src/api/extensions/fetchers.md index 713126b7..907a056f 100644 --- a/docs/src/api/extensions/fetchers.md +++ b/docs/src/api/extensions/fetchers.md @@ -66,80 +66,6 @@ Example: } ``` -## fetchGithub - -Fetch a commit from the specified Git repository at GitHub. - -Types: - -- fetchGithub (`function { ... } -> package`): - - owner (`str`): - Owner of the repository. - - repo (`str`): - Name of the repository. - - rev (`str`): - Commit, branch or tag to fetch. - - sha256 (`str`): - SHA256 of the expected output, - In order to get the SHA256 - you can omit this parameter and execute Makes, - Makes will tell you the correct SHA256 on failure. - -Example: - -=== "main.nix" - - ```nix - # /path/to/my/project/makes/example/main.nix - { - fetchGithub, - ... - }: - fetchGithub { - owner = "kamadorueda"; - repo = "mailmap-linter"; - rev = "e0799aa47ac5ce6776ca8581ba50ace362e5d0ce"; - sha256 = "02nr39rn4hicfam1rccbqhn6w6pl25xq7fl2kw0s0ahxzvfk24mh"; - } - ``` - -## fetchGitlab - -Fetch a commit from the specified Git repository at GitLab. - -Types: - -- fetchGitlab (`function { ... } -> package`): - - owner (`str`): - Owner of the repository. - - repo (`str`): - Name of the repository. - - rev (`str`): - Commit, branch or tag to fetch. - - sha256 (`str`): - SHA256 of the expected output, - In order to get the SHA256 - you can omit this parameter and execute Makes, - Makes will tell you the correct SHA256 on failure. - -Example: - -=== "main.nix" - - ```nix - # /path/to/my/project/makes/example/main.nix - { - fetchGitlab, - ... - }: - fetchGitlab { - owner = "fluidattacks"; - repo = "product"; - rev = "ff231a9bf8aa3f0807f3431b402e7af08d136341"; - sha256 = "1sfbif0bchdpw4rlfpv9gs4l4bmg8l24fqh2hg6m39msrvh1w6h3"; - } - ``` - ## fetchNixpkgs Fetch a commit from the diff --git a/src/args/agnostic.nix b/src/args/agnostic.nix index fcbd89d0..e6443a68 100644 --- a/src/args/agnostic.nix +++ b/src/args/agnostic.nix @@ -37,8 +37,6 @@ let inherit (__nixpkgs__.lib.strings) escapeShellArgs; inherit (__nixpkgs__.lib) fakeSha256; fetchArchive = import ./fetch-archive/default.nix self; - fetchGithub = import ./fetch-github/default.nix self; - fetchGitlab = import ./fetch-gitlab/default.nix self; fetchNixpkgs = import ./fetch-nixpkgs/default.nix self; fetchRubyGem = import ./fetch-rubygem/default.nix self; fetchUrl = import ./fetch-url/default.nix self; diff --git a/src/args/fetch-github/default.nix b/src/args/fetch-github/default.nix deleted file mode 100644 index 3126fd01..00000000 --- a/src/args/fetch-github/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ fakeSha256, fetchArchive, ... }: -{ rev, owner, repo, sha256 ? fakeSha256, }: -fetchArchive { - inherit sha256; - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; -} diff --git a/src/args/fetch-gitlab/default.nix b/src/args/fetch-gitlab/default.nix deleted file mode 100644 index f2ed356d..00000000 --- a/src/args/fetch-gitlab/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ fakeSha256, fetchArchive, ... }: -{ rev, owner, repo, sha256 ? fakeSha256, }: -fetchArchive { - inherit sha256; - url = "https://gitlab.com/${owner}/${repo}/-/archive/${rev}.tar.gz"; -} diff --git a/src/args/fetch-nixpkgs/default.nix b/src/args/fetch-nixpkgs/default.nix index 6e6a5623..3774ae5a 100644 --- a/src/args/fetch-nixpkgs/default.nix +++ b/src/args/fetch-nixpkgs/default.nix @@ -1,10 +1,8 @@ -{ fakeSha256, fetchGithub, ... }: +{ fakeSha256, ... }: { rev, acceptAndroidSdkLicense ? true, allowUnfree ? true, overlays ? [ ] , sha256 ? fakeSha256, }: -import (fetchGithub { - inherit rev; - owner = "nixos"; - repo = "nixpkgs"; +import (builtins.fetchTarball { + url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz"; inherit sha256; }) { config = { diff --git a/src/args/lint-git-mailmap/default.nix b/src/args/lint-git-mailmap/default.nix index fda97e57..dd8ddb67 100644 --- a/src/args/lint-git-mailmap/default.nix +++ b/src/args/lint-git-mailmap/default.nix @@ -1,11 +1,11 @@ -{ __nixpkgs__, fetchGithub, makeScript, ... }: +{ __nixpkgs__, makeScript, ... }: { name, src, exclude, }: let - mailmapLinter = fetchGithub { - owner = "kamadorueda"; - repo = "mailmap-linter"; - rev = "ffed6a68e507228d7e462642a8ec129f816b6a5d"; - sha256 = "XHmqLTT7TZ/dXBtQSH1xkEGSWI4mpImt+KRqBHbfGLk="; + rev = "ffed6a68e507228d7e462642a8ec129f816b6a5d"; + sha256 = "XHmqLTT7TZ/dXBtQSH1xkEGSWI4mpImt+KRqBHbfGLk="; + mailmapLinter = builtins.fetchTarball { + url = "https://github.com/kamadorueda/mailmap-linter/archive/${rev}.tar.gz"; + inherit sha256; }; in makeScript { entrypoint = ./entrypoint.sh; diff --git a/src/args/secure-kubernetes-with-rbac-police/default.nix b/src/args/secure-kubernetes-with-rbac-police/default.nix index daf8092b..9b9a3f2d 100644 --- a/src/args/secure-kubernetes-with-rbac-police/default.nix +++ b/src/args/secure-kubernetes-with-rbac-police/default.nix @@ -1,4 +1,4 @@ -{ __nixpkgs__, fetchGithub, fetchUrl, makeDerivation, makeScript, ... }: +{ __nixpkgs__, fetchUrl, makeDerivation, makeScript, ... }: { name, setup, severity, ... }: let bin = makeDerivation { @@ -18,10 +18,9 @@ let patchelf --set-interpreter "$envGlibc/lib/ld-linux-x86-64.so.2" "$out" ''; }; - repo = fetchGithub { - owner = "PaloAltoNetworks"; - repo = "rbac-police"; - rev = "ffe47f709a747fc92cbeeb2eec688b4ea544b958"; + repo = builtins.fetchTarball { + url = + "https://github.com/PaloAltoNetworks/rbac-police/archive/ffe47f709a747fc92cbeeb2eec688b4ea544b958.tar.gz"; sha256 = "0hna14rwkfadqq2higzz033hkdpxpnzi5vg340xsk50ipr41g689"; }; in makeScript {