diff options
author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2017-10-30 16:53:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-30 16:53:44 +0100 |
commit | c5dadc7f32d813c566476233fff9cd3e9ff70b4f (patch) | |
tree | 0273f75527396eb447970f567777dd0e9981d93e | |
parent | 4a4f6ba41878d514d7c2616c85242ff31a13a06b (diff) | |
parent | febe376f13b7b57de26af5af271ddcb565a25d74 (diff) | |
download | nixlib-c5dadc7f32d813c566476233fff9cd3e9ff70b4f.tar nixlib-c5dadc7f32d813c566476233fff9cd3e9ff70b4f.tar.gz nixlib-c5dadc7f32d813c566476233fff9cd3e9ff70b4f.tar.bz2 nixlib-c5dadc7f32d813c566476233fff9cd3e9ff70b4f.tar.lz nixlib-c5dadc7f32d813c566476233fff9cd3e9ff70b4f.tar.xz nixlib-c5dadc7f32d813c566476233fff9cd3e9ff70b4f.tar.zst nixlib-c5dadc7f32d813c566476233fff9cd3e9ff70b4f.zip |
Merge pull request #30973 from nixos-docs/feat-remove-fetch-adc
fetchadc: removed
-rw-r--r-- | pkgs/build-support/fetchadc/builder.sh | 7 | ||||
-rw-r--r-- | pkgs/build-support/fetchadc/default.nix | 36 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
3 files changed, 0 insertions, 52 deletions
diff --git a/pkgs/build-support/fetchadc/builder.sh b/pkgs/build-support/fetchadc/builder.sh deleted file mode 100644 index ceeaa9213d65..000000000000 --- a/pkgs/build-support/fetchadc/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -loginpage=`curl --insecure -s -L -b cookies.txt "$url"` - -[[ $loginpage =~ form[^\>]+action=\"([^\"]+)\" ]] && loginurl=${BASH_REMATCH[1]} - -curl --insecure -s --output "$out" -L -b cookies.txt --data "appleId=${adc_user}&accountPassword=${adc_pass}" "https://idmsa.apple.com/IDMSWebAuth/${loginurl}" diff --git a/pkgs/build-support/fetchadc/default.nix b/pkgs/build-support/fetchadc/default.nix deleted file mode 100644 index 4d759e6f7f18..000000000000 --- a/pkgs/build-support/fetchadc/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, curl, adc_user, adc_pass }: - -{ # Path to fetch. - path - - # Hash of the downloaded file -, sha256 - -, # Additional curl options needed for the download to succeed. - curlOpts ? "" - -, # Name of the file. If empty, use the basename of `path'. - name ? "" -}: - -stdenv.mkDerivation { - url = "https://developer.apple.com/downloads/download.action?path=${path}"; - - name = if name != "" then name else baseNameOf path; - builder = ./builder.sh; - - buildInputs = [ curl ]; - - meta = { - # Password-guarded files from ADC are certainly unfree, as far as we're concerned! - license = stdenv.lib.licenses.unfree; - }; - - outputHashAlgo = "sha256"; - outputHash = sha256; - outputHashMode = "flat"; - - inherit curlOpts adc_user adc_pass; - - preferLocalBuild = true; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 762f217fcbea..e833d3dec098 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -126,15 +126,6 @@ with pkgs; vs = vs90wrapper; }; - fetchadc = callPackage ../build-support/fetchadc { - adc_user = if config ? adc_user - then config.adc_user - else throw "You need an adc_user attribute in your config to download files from Apple Developer Connection"; - adc_pass = if config ? adc_pass - then config.adc_pass - else throw "You need an adc_pass attribute in your config to download files from Apple Developer Connection"; - }; - fetchbower = callPackage ../build-support/fetchbower { inherit (nodePackages) bower2nix; }; |