From 1a64deeb894dc95e2645a75771732c6cc53a79ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 4 Oct 2023 01:35:06 +0200 Subject: Squash changes containing private information There were a lot of changes since the previous commit, but a lot of them contained personnal information about users. All thos changes got stashed into a single commit (history is kept in a different place) and private information was moved in a separate private repository --- pkgs/umami/build-geo.patch | 15 ---------- pkgs/umami/default.nix | 72 ---------------------------------------------- 2 files changed, 87 deletions(-) delete mode 100644 pkgs/umami/build-geo.patch delete mode 100644 pkgs/umami/default.nix (limited to 'pkgs/umami') diff --git a/pkgs/umami/build-geo.patch b/pkgs/umami/build-geo.patch deleted file mode 100644 index 7a4f075..0000000 --- a/pkgs/umami/build-geo.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/scripts/build-geo.js b/scripts/build-geo.js -index cc66f94..5464b54 100644 ---- a/scripts/build-geo.js -+++ b/scripts/build-geo.js -@@ -22,9 +22,7 @@ if (!fs.existsSync(dest)) { - - const download = url => - new Promise(resolve => { -- https.get(url, res => { -- resolve(res.pipe(zlib.createGunzip({})).pipe(tar.t())); -- }); -+ resolve(fs.createReadStream(url).pipe(zlib.createGunzip({})).pipe(tar.t())); - }); - - download(url).then( diff --git a/pkgs/umami/default.nix b/pkgs/umami/default.nix deleted file mode 100644 index 5620f90..0000000 --- a/pkgs/umami/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ nodejs, writeScriptBin, stdenv, yarn2nix-moretea, lib, fetchzip, fetchurl, zlib, openssl, fetchFromGitHub }: -let - version = "1.17.0"; - geolite2-country-url = "https://raw.githubusercontent.com/GitSquared/node-geolite2-redist/master/redist/GeoLite2-Country.tar.gz"; - geolite2-country = fetchurl { - url = geolite2-country-url; - sha256 = "0mdjvx1dfpkhg5kbp7jnrspzybaavhlxmna44l7rw05nrw5nv9zw"; - }; - toBin = sha256: name: fetchurl { - inherit name sha256; - url = "https://binaries.prisma.sh/all_commits/e421996c87d5f3c8f7eeadd502d4ad402c89464d/debian-openssl-1.1.x/${name}.gz"; - downloadToTemp = true; - executable = true; - postFetch = '' - cat "$downloadedFile" | gunzip > $out - patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ - --set-rpath "${lib.makeLibraryPath [ openssl zlib ]}:$(patchelf --print-rpath $out)" \ - $out - chmod +x $out - ''; - }; - binaries = { - DATABASE_TYPE = "postgresql"; - PRISMA_QUERY_ENGINE_BINARY = toBin "1sy67xqvbmgzksw7bl31k74k41jr44n514idqbi70j2i6jxbrl4j" "query-engine"; - PRISMA_INTROSPECTION_ENGINE_BINARY = toBin "1kcszg11f71sg2y0ki7kg4prwlyb67bdjpjcky9kyjd8n9ilc8hj" "introspection-engine"; - PRISMA_MIGRATION_ENGINE_BINARY = toBin "1lmz0wwjaavap9k6z5ysqrhlgs3r3kc9jpri2lv0lq95qmwr5hzq" "migration-engine"; - PRISMA_FMT_BINARY = toBin "0241aszja3j1pp7pxs40irmfj06ilfjbzyqjzrzrb5azk7izwm73" "prisma-fmt"; - }; - src = fetchFromGitHub { - owner = "mikecao"; - repo = "umami"; - rev = "v${version}"; - sha256 = "15jfgf057lsl20vdw45v5cim5d2ilalzaaxn6h82pz4d2fj1w0nh"; - }; - node-modules = yarn2nix-moretea.mkYarnModules rec { - pname = "umami"; - inherit version; - name = "${pname}-${version}"; - yarnLock = "${src}/yarn.lock"; - packageJSON = "${src}/package.json"; - pkgConfig.npm-run-all.postInstall = '' - patchShebangs . - ''; - pkgConfig.rollup.postInstall = '' - patchShebangs . - ''; - }; - package = stdenv.mkDerivation (binaries // { - pname = "umami"; - inherit version src; - buildInputs = [ nodejs ]; - patches = [ ./build-geo.patch ]; - configurePhase = '' - cp -r ${node-modules}/node_modules . - chmod u+w -R node_modules - ''; - buildPhase = '' - sed -i -e "s@${geolite2-country-url}@${geolite2-country}@" scripts/build-geo.js - npm run build - ''; - installPhase = '' - cp -a . $out - ''; - }); - script = writeScriptBin "umami" ('' - #! ${stdenv.shell} - cd ${package} - '' + builtins.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "export ${n}=${v}") binaries) + "\n" + '' - ${nodejs}/bin/npm run start-env - ''); -in - script // { nodeApp = package; } -- cgit v1.2.3