From 0e87110ade0e76ebfcffda333d5929fb12f03e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastien=20Rivi=C3=A8re?= Date: Sat, 4 Apr 2020 14:57:04 +0200 Subject: [PATCH] dart(freeform-gradient): update flutter version Signed-off-by: prescientmoon --- dart/freeform-gradient/nix/android.nix | 22 ++++ dart/freeform-gradient/nix/sources.json | 26 +++++ dart/freeform-gradient/nix/sources.nix | 138 ++++++++++++++++++++++++ dart/freeform-gradient/shell.nix | 12 ++- 4 files changed, 193 insertions(+), 5 deletions(-) create mode 100644 dart/freeform-gradient/nix/android.nix create mode 100644 dart/freeform-gradient/nix/sources.json create mode 100644 dart/freeform-gradient/nix/sources.nix diff --git a/dart/freeform-gradient/nix/android.nix b/dart/freeform-gradient/nix/android.nix new file mode 100644 index 0000000..4452e18 --- /dev/null +++ b/dart/freeform-gradient/nix/android.nix @@ -0,0 +1,22 @@ +{ androidenv }: + +androidenv.composeAndroidPackages { + toolsVersion = "25.2.5"; + platformToolsVersion = "28.0.1"; + buildToolsVersions = [ "28.0.3" ]; + includeEmulator = true; + emulatorVersion = "28.0.14"; + platformVersions = [ "28" ]; + includeSources = false; + includeDocs = false; + includeSystemImages = true; + systemImageTypes = [ "default" ]; + abiVersions = [ "x86_64" ]; + # lldbVersions = [ "2.0.2558144" ]; + # cmakeVersions = [ "3.6.4111459" ]; + includeNDK = false; + # ndkVersion = "16.1.4479499"; + useGoogleAPIs = false; + useGoogleTVAddOns = false; + # includeExtras = [ "extras;google;gcm" ]; +} diff --git a/dart/freeform-gradient/nix/sources.json b/dart/freeform-gradient/nix/sources.json new file mode 100644 index 0000000..2ad18c0 --- /dev/null +++ b/dart/freeform-gradient/nix/sources.json @@ -0,0 +1,26 @@ +{ + "niv": { + "branch": "master", + "description": "Easy dependency management for Nix projects", + "homepage": "https://github.com/nmattia/niv", + "owner": "nmattia", + "repo": "niv", + "rev": "f73bf8d584148677b01859677a63191c31911eae", + "sha256": "0jlmrx633jvqrqlyhlzpvdrnim128gc81q5psz2lpp2af8p8q9qs", + "type": "tarball", + "url": "https://github.com/nmattia/niv/archive/f73bf8d584148677b01859677a63191c31911eae.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "nixpkgs": { + "branch": "master", + "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to", + "homepage": "https://github.com/NixOS/nixpkgs", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "696274fae7202740e9b209ea2dfb4d0ba436751f", + "sha256": "0ywd9nfy1sd801b2iarjijzrk520mrxp0r5mfvwqz1l0r2018qbk", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/696274fae7202740e9b209ea2dfb4d0ba436751f.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + } +} diff --git a/dart/freeform-gradient/nix/sources.nix b/dart/freeform-gradient/nix/sources.nix new file mode 100644 index 0000000..7bd0f3e --- /dev/null +++ b/dart/freeform-gradient/nix/sources.nix @@ -0,0 +1,138 @@ +# This file has been generated by Niv. + +let + + # + # The fetchers. fetch_ fetches specs of type . + # + + fetch_file = pkgs: spec: + if spec.builtin or true then + builtins_fetchurl { inherit (spec) url sha256; } + else + pkgs.fetchurl { inherit (spec) url sha256; }; + + fetch_tarball = pkgs: name: spec: + let + ok = str: ! builtins.isNull (builtins.match "[a-zA-Z0-9+-._?=]" str); + # sanitize the name, though nix will still fail if name starts with period + name' = stringAsChars (x: if ! ok x then "-" else x) "${name}-src"; + in + if spec.builtin or true then + builtins_fetchTarball { name = name'; inherit (spec) url sha256; } + else + pkgs.fetchzip { name = name'; inherit (spec) url sha256; }; + + fetch_git = spec: + builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; }; + + fetch_local = spec: spec.path; + + fetch_builtin-tarball = name: throw + ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`. + $ niv modify ${name} -a type=tarball -a builtin=true''; + + fetch_builtin-url = name: throw + ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`. + $ niv modify ${name} -a type=file -a builtin=true''; + + # + # Various helpers + # + + # The set of packages used when specs are fetched using non-builtins. + mkPkgs = sources: + let + sourcesNixpkgs = + import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {}; + hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath; + hasThisAsNixpkgsPath = == ./.; + in + if builtins.hasAttr "nixpkgs" sources + then sourcesNixpkgs + else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then + import {} + else + abort + '' + Please specify either (through -I or NIX_PATH=nixpkgs=...) or + add a package called "nixpkgs" to your sources.json. + ''; + + # The actual fetching function. + fetch = pkgs: name: spec: + + if ! builtins.hasAttr "type" spec then + abort "ERROR: niv spec ${name} does not have a 'type' attribute" + else if spec.type == "file" then fetch_file pkgs spec + else if spec.type == "tarball" then fetch_tarball pkgs name spec + else if spec.type == "git" then fetch_git spec + else if spec.type == "local" then fetch_local spec + else if spec.type == "builtin-tarball" then fetch_builtin-tarball name + else if spec.type == "builtin-url" then fetch_builtin-url name + else + abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}"; + + # Ports of functions for older nix versions + + # a Nix version of mapAttrs if the built-in doesn't exist + mapAttrs = builtins.mapAttrs or ( + f: set: with builtins; + listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set)) + ); + + # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295 + range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1); + + # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257 + stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1)); + + # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269 + stringAsChars = f: s: concatStrings (map f (stringToCharacters s)); + concatStrings = builtins.concatStringsSep ""; + + # fetchTarball version that is compatible between all the versions of Nix + builtins_fetchTarball = { url, name, sha256 }@attrs: + let + inherit (builtins) lessThan nixVersion fetchTarball; + in + if lessThan nixVersion "1.12" then + fetchTarball { inherit name url; } + else + fetchTarball attrs; + + # fetchurl version that is compatible between all the versions of Nix + builtins_fetchurl = { url, sha256 }@attrs: + let + inherit (builtins) lessThan nixVersion fetchurl; + in + if lessThan nixVersion "1.12" then + fetchurl { inherit url; } + else + fetchurl attrs; + + # Create the final "sources" from the config + mkSources = config: + mapAttrs ( + name: spec: + if builtins.hasAttr "outPath" spec + then abort + "The values in sources.json should not have an 'outPath' attribute" + else + spec // { outPath = fetch config.pkgs name spec; } + ) config.sources; + + # The "config" used by the fetchers + mkConfig = + { sourcesFile ? ./sources.json + , sources ? builtins.fromJSON (builtins.readFile sourcesFile) + , pkgs ? mkPkgs sources + }: rec { + # The sources, i.e. the attribute set of spec name to spec + inherit sources; + + # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers + inherit pkgs; + }; +in +mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); } diff --git a/dart/freeform-gradient/shell.nix b/dart/freeform-gradient/shell.nix index d5ca7a9..234ed73 100644 --- a/dart/freeform-gradient/shell.nix +++ b/dart/freeform-gradient/shell.nix @@ -1,10 +1,12 @@ -{ pkgs ? import {} }: +{ sources ? import ./nix/sources.nix }: let - flutter = (import (builtins.fetchTarball - "https://github.com/babariviere/nixpkgs/archive/flutter-init.tar.gz") {}).flutter; + pkgs = import sources.nixpkgs {}; + android = pkgs.callPackage ./nix/android.nix { }; in pkgs.mkShell { - buildInputs = [ flutter ]; + buildInputs = [ pkgs.flutter pkgs.jdk android.platform-tools ]; - ANDROID_HOME = "${pkgs.androidsdk_9_0}/libexec/android-sdk"; + ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk"; + JAVA_HOME = pkgs.jdk; + ANDROID_AVD_HOME = (toString ./.) + "/.android/avd"; }