git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #140337 from Artturin/overidesrcfetchff
commit46c22f8932d3d0eb8e509293f2ac42cf08417997 authorArtturi <Artturin@artturin.com> dateThu 7 Oct 2021, 18:20 (5 years ago) parent70088dccd42b9f
2 files changed+24−10
pkgs/build-support/fetchfirefoxaddon/default.nix+12−9 pkgs/build-support/fetchfirefoxaddon/tests.nix+12−1
pkgs/build-support/fetchfirefoxaddon/default.nix+12−9
@@ -2,19 +2,26 @@
22
33{
44 name
5−, url
5+, url ? null
66, md5 ? ""
77, sha1 ? ""
88, sha256 ? ""
99, sha512 ? ""
1010, fixedExtid ? null
1111, hash ? ""
12+, src ? ""
1213}:
1314
14−stdenv.mkDerivation rec {
15−
16− inherit name;
15+let
1716 extid = if fixedExtid == null then "nixos@${name}" else fixedExtid;
17+ source = if url == null then src else fetchurl {
18+ url = url;
19+ inherit md5 sha1 sha256 sha512 hash;
20+ };
21+in
22+stdenv.mkDerivation {
23+ inherit name;
24+
1825 passthru = {
1926 inherit extid;
2027 };
@@ -26,16 +33,12 @@ stdenv.mkDerivation rec {
2633
2734 UUID="${extid}"
2835 mkdir -p "$out/$UUID"
29− unzip -q ${src} -d "$out/$UUID"
36+ unzip -q ${source} -d "$out/$UUID"
3037 NEW_MANIFEST=$(jq '. + {"applications": { "gecko": { "id": "${extid}" }}, "browser_specific_settings":{"gecko":{"id": "${extid}"}}}' "$out/$UUID/manifest.json")
3138 echo "$NEW_MANIFEST" > "$out/$UUID/manifest.json"
3239 cd "$out/$UUID"
3340 zip -r -q -FS "$out/$UUID.xpi" *
3441 rm -r "$out/$UUID"
3542 '';
36− src = fetchurl {
37− url = url;
38− inherit md5 sha1 sha256 sha512 hash;
39− };
4043 nativeBuildInputs = [ coreutils unzip zip jq ];
4144}
pkgs/build-support/fetchfirefoxaddon/tests.nix+12−1
@@ -1,4 +1,4 @@
1−{ invalidateFetcherByDrvHash, fetchFirefoxAddon, ... }:
1+{ invalidateFetcherByDrvHash, fetchFirefoxAddon, fetchurl, ... }:
22
33{
44 simple = invalidateFetcherByDrvHash fetchFirefoxAddon {
@@ -7,4 +7,15 @@
77 url = "https://addons.mozilla.org/firefox/downloads/file/3059971/image_search_options-3.0.12-fx.xpi";
88 sha256 = "sha256-H73YWX/DKxvhEwKpWOo7orAQ7c/rQywpljeyxYxv0Gg=";
99 };
10+ overidden-source =
11+ let
12+ image-search-options = fetchurl {
13+ url = "https://addons.mozilla.org/firefox/downloads/file/3059971/image_search_options-3.0.12-fx.xpi";
14+ sha256 = "sha256-H73YWX/DKxvhEwKpWOo7orAQ7c/rQywpljeyxYxv0Gg=";
15+ };
16+ in
17+ invalidateFetcherByDrvHash fetchFirefoxAddon {
18+ name = "image-search-options";
19+ src = image-search-options;
20+ };
1021}