From d2e93acf321913d94aeb087c6e488f5e4ba4ad2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 17 Aug 2023 13:18:47 -0700 Subject: [PATCH 1/2] titanium-alloy: use buildNpmPackage --- .../mobile/titanium-alloy/default.nix | 29 ++++ .../mobile/titaniumenv/default.nix | 3 +- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 152 ------------------ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 34 insertions(+), 154 deletions(-) create mode 100644 pkgs/development/mobile/titanium-alloy/default.nix diff --git a/pkgs/development/mobile/titanium-alloy/default.nix b/pkgs/development/mobile/titanium-alloy/default.nix new file mode 100644 index 000000000000..bb45289e3f40 --- /dev/null +++ b/pkgs/development/mobile/titanium-alloy/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "alloy"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "tidev"; + repo = "alloy"; + rev = version; + hash = "sha256-s1hAbbUy7k/GacBIk8OMD48/1IUcRcpV3LnrCCZim1A="; + }; + + npmDepsHash = "sha256-YNyFrO6+oFluyk3TlUf/0vdHrgTJ3l5DN801wnpBa6s="; + + dontNpmBuild = true; + + meta = { + changelog = "https://github.com/tidev/alloy/blob/${src.rev}/CHANGELOG.md"; + description = "MVC framework for the Appcelerator Titanium SDK"; + homepage = "https://github.com/tidev/alloy"; + license = lib.licenses.asl20; + mainProgram = "alloy"; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 151502a5d160..e0d5ef02d7da 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -13,7 +13,8 @@ rec { buildApp = import ./build-app.nix { inherit (pkgs) stdenv lib python which file jdk nodejs; - inherit (pkgs.nodePackages) alloy titanium; + alloy = pkgs.titanium-alloy; + inherit (pkgs.nodePackages) titanium; inherit (androidenv) composeAndroidPackages; inherit (xcodeenv) composeXcodeWrapper; inherit titaniumsdk; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 707426d2c22c..77dd80a7bcaa 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -46,6 +46,7 @@ mapAliases { "@maizzle/cli" = pkgs.maizzle; # added 2023-08-17 "@medable/mdctl-cli" = throw "@medable/mdctl-cli was removed because it was broken"; # added 2023-08-21 "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 + alloy = pkgs.titanium-alloy; # added 2023-08-17 antennas = pkgs.antennas; # added 2023-07-30 inherit (pkgs) asar; # added 2023-08-26 balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index be3b1826e120..3f3c4d6df2e0 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -25,7 +25,6 @@ , {"@webassemblyjs/wasm-text-gen": "1.11.1"} , {"@webassemblyjs/wast-refmt": "1.11.1"} , "alex" -, "alloy" , "audiosprite" , "autoprefixer" , "auto-changelog" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f73e03a6be10..68823ed8d96d 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -75436,158 +75436,6 @@ in bypassCache = true; reconstructLock = true; }; - alloy = nodeEnv.buildNodePackage { - name = "alloy"; - packageName = "alloy"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-2.0.2.tgz"; - sha512 = "FhZLGIKAewqzsJ50H44NU/PTAW2vt00M8dMkO6BFgCH7Z925+8bfcQ9PCBAufynDQXrAR6h7Kd9Im4YXyizbIA=="; - }; - dependencies = [ - sources."@ampproject/remapping-2.2.1" - sources."@babel/code-frame-7.22.10" - sources."@babel/compat-data-7.22.9" - sources."@babel/core-7.22.10" - sources."@babel/generator-7.22.10" - sources."@babel/helper-compilation-targets-7.22.10" - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" - sources."@babel/helper-hoist-variables-7.22.5" - sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.9" - sources."@babel/helper-simple-access-7.22.5" - sources."@babel/helper-split-export-declaration-7.22.6" - sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.5" - sources."@babel/helper-validator-option-7.22.5" - sources."@babel/helpers-7.22.10" - sources."@babel/highlight-7.22.10" - sources."@babel/parser-7.22.10" - sources."@babel/template-7.22.5" - sources."@babel/traverse-7.22.10" - sources."@babel/types-7.22.10" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" - sources."@xmldom/xmldom-0.8.10" - sources."JSV-4.0.2" - sources."ansi-styles-3.2.1" - sources."array-unique-0.3.2" - sources."async-3.2.4" - sources."balanced-match-1.0.2" - sources."brace-expansion-2.0.1" - sources."browserslist-4.21.10" - sources."caniuse-lite-1.0.30001522" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."colors-1.4.0" - sources."commander-8.3.0" - sources."concat-map-0.0.1" - sources."convert-source-map-1.9.0" - sources."debug-4.3.4" - sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.499" - sources."ensure-posix-path-1.1.1" - sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" - (sources."filelist-1.0.4" // { - dependencies = [ - sources."minimatch-5.1.6" - ]; - }) - sources."fs-extra-5.0.0" - sources."function-bind-1.1.1" - sources."gensync-1.0.0-beta.2" - (sources."global-modules-0.2.3" // { - dependencies = [ - sources."is-windows-0.2.0" - ]; - }) - sources."global-paths-1.0.0" - (sources."global-prefix-0.1.5" // { - dependencies = [ - sources."is-windows-0.2.0" - ]; - }) - sources."globals-11.12.0" - sources."graceful-fs-4.2.11" - sources."has-1.0.3" - sources."has-color-0.1.7" - sources."has-flag-3.0.0" - sources."homedir-polyfill-1.0.3" - sources."ini-1.3.8" - sources."is-3.3.0" - sources."is-core-module-2.13.0" - sources."is-windows-1.0.2" - sources."isexe-2.0.0" - (sources."jake-10.8.7" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."js-tokens-4.0.0" - sources."jsesc-2.5.2" - sources."json5-2.2.3" - sources."jsonfile-4.0.0" - sources."jsonlint-1.6.3" - sources."lodash-4.17.21" - sources."lru-cache-5.1.1" - sources."matcher-collection-1.1.2" - (sources."minimatch-3.1.2" // { - dependencies = [ - sources."brace-expansion-1.1.11" - ]; - }) - sources."moment-2.29.1" - sources."ms-2.1.2" - sources."node-releases-2.0.13" - sources."node.extend-2.0.2" - (sources."nomnom-1.8.1" // { - dependencies = [ - sources."ansi-styles-1.0.0" - sources."chalk-0.4.0" - ]; - }) - sources."parse-passwd-1.0.0" - sources."path-parse-1.0.7" - sources."picocolors-1.0.0" - sources."pkginfo-0.4.1" - sources."resolve-1.22.4" - sources."sax-0.5.8" - sources."semver-6.3.1" - sources."source-map-0.7.4" - sources."strip-ansi-0.1.1" - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."to-fast-properties-2.0.0" - sources."underscore-1.6.0" - sources."universalify-0.1.2" - sources."update-browserslist-db-1.0.11" - sources."walk-sync-0.3.4" - sources."which-1.3.1" - sources."xml2js-0.2.8" - sources."xml2tss-0.0.5" - sources."yallist-3.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "TiDev Titanium MVC Framework"; - homepage = "https://github.com/tidev/alloy#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; audiosprite = nodeEnv.buildNodePackage { name = "audiosprite"; packageName = "audiosprite"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f9b93adf075..014eaf1fe024 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4112,6 +4112,8 @@ with pkgs; supergfxctl = callPackage ../applications/system/supergfxctl { }; + titanium-alloy = callPackage ../development/mobile/titanium-alloy { }; + titaniumenv = callPackage ../development/mobile/titaniumenv { }; abootimg = callPackage ../development/mobile/abootimg { }; From 6e701c43e2fd6728456b26be7f790459d867fa76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 17 Aug 2023 13:31:45 -0700 Subject: [PATCH 2/2] titanium: use buildNpmPackage --- pkgs/development/mobile/titanium/default.nix | 29 ++++ .../mobile/titaniumenv/default.nix | 3 +- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 154 ------------------ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 33 insertions(+), 157 deletions(-) create mode 100644 pkgs/development/mobile/titanium/default.nix diff --git a/pkgs/development/mobile/titanium/default.nix b/pkgs/development/mobile/titanium/default.nix new file mode 100644 index 000000000000..0318ceeb18eb --- /dev/null +++ b/pkgs/development/mobile/titanium/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "titanium"; + version = "6.1.1"; + + src = fetchFromGitHub { + owner = "tidev"; + repo = "titanium-cli"; + rev = "v${version}"; + hash = "sha256-eJHf4vbapCaIVk0Xc0sml14jkFCsS/Gv7ftaFakB5rI="; + }; + + npmDepsHash = "sha256-60r+zqUCSDvQgrjg5SGfZiv87AoGx1XcnbW1ki1sbCM="; + + dontNpmBuild = true; + + meta = { + changelog = "https://github.com/tidev/titanium-cli/blob/${src.rev}/CHANGELOG.md"; + description = "Command Line Tool for creating and building Titanium Mobile applications and modules"; + homepage = "https://github.com/tidev/titanium-cli"; + license = lib.licenses.asl20; + mainProgram = "titanium"; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index e0d5ef02d7da..2f1459ef3e04 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -12,9 +12,8 @@ rec { }; buildApp = import ./build-app.nix { - inherit (pkgs) stdenv lib python which file jdk nodejs; + inherit (pkgs) stdenv lib python which file jdk nodejs titanium; alloy = pkgs.titanium-alloy; - inherit (pkgs.nodePackages) titanium; inherit (androidenv) composeAndroidPackages; inherit (xcodeenv) composeXcodeWrapper; inherit titaniumsdk; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 77dd80a7bcaa..55e7f125f9de 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -93,6 +93,7 @@ mapAliases { ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21 stf = throw "stf was removed because it was broken"; # added 2023-08-21 thelounge = pkgs.thelounge; # Added 2023-05-22 + inherit (pkgs) titanium; # added 2023-08-17 triton = pkgs.triton; # Added 2023-05-06 typescript = pkgs.typescript; # Added 2023-06-21 inherit (pkgs) ungit; # added 2023-08-20 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 3f3c4d6df2e0..f6e8fe4e4875 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -317,7 +317,6 @@ , "thelounge-theme-zenburn-sourcecodepro" , "three" , "tiddlywiki" -, "titanium" , "tsun" , "ts-node" , "ttf2eot" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 68823ed8d96d..3e508c617336 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -116483,160 +116483,6 @@ in bypassCache = true; reconstructLock = true; }; - titanium = nodeEnv.buildNodePackage { - name = "titanium"; - packageName = "titanium"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-6.1.1.tgz"; - sha512 = "jz1pZ1jDB72H63SaHYUYLbiBBVmaGPIprSKQr2rbuoNPNasp9EerMouqSUiVdnvaKElpnW/sWiMmPs4XINmo0w=="; - }; - dependencies = [ - sources."@sindresorhus/is-4.6.0" - sources."@szmarczak/http-timer-4.0.6" - sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.4" - sources."@types/node-20.5.3" - sources."@types/responselike-1.0.0" - sources."@xmldom/xmldom-0.8.10" - sources."ajv-6.12.6" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."async-3.2.4" - sources."asynckit-0.4.0" - sources."at-least-node-1.0.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" - sources."balanced-match-1.0.2" - sources."bcrypt-pbkdf-1.0.2" - sources."brace-expansion-1.1.11" - sources."buffer-crc32-0.2.13" - sources."cacheable-lookup-5.0.4" - sources."cacheable-request-7.0.4" - sources."caseless-0.12.0" - sources."clone-response-1.0.3" - sources."colors-1.4.0" - sources."combined-stream-1.0.8" - sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" - sources."cycle-1.0.3" - sources."dashdash-1.14.1" - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."defer-to-connect-2.0.1" - sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.2" - sources."end-of-stream-1.4.4" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."eyes-0.1.8" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fd-slicer-1.1.0" - (sources."fields-0.1.24" // { - dependencies = [ - sources."colors-0.6.2" - ]; - }) - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs-extra-9.1.0" - sources."fs.realpath-1.0.0" - sources."get-stream-5.2.0" - sources."getpass-0.1.7" - sources."glob-7.2.3" - sources."got-11.8.6" - sources."graceful-fs-4.2.11" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."http-cache-semantics-4.1.1" - sources."http-signature-1.2.0" - sources."http2-wrapper-1.0.3" - sources."humanize-0.0.9" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-buffer-3.0.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-6.1.0" - sources."jsprim-1.4.2" - sources."keypress-0.2.1" - sources."keyv-4.5.3" - sources."lowercase-keys-2.0.0" - sources."lru-cache-6.0.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-response-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."node-appc-1.1.6" - sources."normalize-url-6.1.0" - sources."oauth-sign-0.9.0" - sources."once-1.4.0" - sources."p-cancelable-2.1.1" - sources."path-is-absolute-1.0.1" - sources."pend-1.2.0" - sources."performance-now-2.1.0" - sources."psl-1.9.0" - sources."pump-3.0.0" - sources."punycode-2.3.0" - sources."qs-6.5.3" - sources."quick-lru-5.1.1" - (sources."request-2.88.2" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) - sources."resolve-alpn-1.2.1" - sources."responselike-2.0.1" - sources."rimraf-2.6.3" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."semver-7.3.8" - sources."sprintf-0.1.5" - sources."sshpk-1.17.0" - sources."stack-trace-0.0.10" - sources."temp-0.9.4" - (sources."tmp-0.2.1" // { - dependencies = [ - sources."rimraf-3.0.2" - ]; - }) - sources."tough-cookie-2.5.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."universalify-2.0.0" - sources."uri-js-4.4.1" - sources."uuid-9.0.0" - sources."verror-1.10.0" - (sources."winston-2.4.6" // { - dependencies = [ - sources."colors-1.0.3" - ]; - }) - sources."wrappy-1.0.2" - sources."yallist-4.0.0" - sources."yauzl-2.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "TiDev Titanium Command line"; - homepage = "https://github.com/tidev/titanium#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; tsun = nodeEnv.buildNodePackage { name = "tsun"; packageName = "tsun"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 014eaf1fe024..6bb2b6204f92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4112,6 +4112,8 @@ with pkgs; supergfxctl = callPackage ../applications/system/supergfxctl { }; + titanium = callPackage ../development/mobile/titanium { }; + titanium-alloy = callPackage ../development/mobile/titanium-alloy { }; titaniumenv = callPackage ../development/mobile/titaniumenv { };