lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

honk:

Browse source
This commit is contained in:
Luke Granger-Brown 2024-08-04 18:51:12 +01:00
parent 5ca88bfbb9
commit 09068d7c24
16 changed files with 3928 additions and 8527 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nix/pkgs/authentik/pythonapp/default.nix
View file

@ -124,6 +124,7 @@ let
rev = "lxml-4.9.4";
sha256 = "sha256:160x1z93q916lqcj571g7295hyl8an8dnppni2lmcy1ppz0v8bd9";
};
buildInputs = (old.buildInputs or []) ++ [ pkgs.zlib ];
});
twisted = assert assertVersion super.twisted "23.10.0"; super.twisted.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or []) ++ [ self.hatchling self.hatch-fancy-pypi-readme self.incremental ];

3
nix/pkgs/baserow/default.nix
View file

@ -4,12 +4,13 @@
, lib
, stdenv
, makeWrapper
, python3
, python311
, nodejs-18_x
, ossOnly ? true
}:
let
python3 = python311;
version = "1.16.0";
suffix = lib.optionalString ossOnly "-oss";
src' = fetchFromGitLab {

22
nix/pkgs/bazel-run.nix
View file

@ -1,22 +0,0 @@
# SPDX-FileCopyrightText: 2020 Luke Granger-Brown <depot@lukegb.com>
#
# SPDX-License-Identifier: Apache-2.0
{ pkgs, lib, system, ... }:
let
bazelTop = pkgs.buildFHSUserEnv {
name = "bazel-wrap";
targetPkgs = pkgs: [
(pkgs.bazel.override { enableNixHacks = true; })
pkgs.adoptopenjdk-hotspot-bin-11
pkgs.zlib
pkgs.python3
pkgs.curl
pkgs.nodejs
pkgs.yarn
pkgs.git
pkgs.gcc
] ++ lib.optional (system == "x86_64-linux") pkgs.jetbrains.idea-community;
};
in
bazelTop // { override = x: bazelTop; }

8
nix/pkgs/default.nix
View file

@ -3,7 +3,6 @@
# SPDX-License-Identifier: Apache-2.0
{ depot, pkgs, ... }@args: rec {
bazel-run = import ./bazel-run.nix args;
crane = import ./crane.nix args;
javaws-env = import ./javaws-env.nix args;
plex-pass = import ./plex-pass.nix args;
@ -17,14 +16,13 @@
grafana-plugins = import ./grafana-plugins args;
unifiHacked = import ./unifi-hack args;
tiny-remapper = import ./tiny-remapper.nix args;
django-allauth = pkgs.python3Packages.callPackage ./django-allauth.nix {};
django-tailwind = pkgs.python3Packages.callPackage ./django-tailwind.nix {};
windows = import ./windows args;
hp-rom = import ./hp-rom.nix args;
enigma = import ./enigma.nix args;
alertmanager-discord = pkgs.callPackage ./alertmanager-discord.nix {};
prometheus-snmp-config = import ./prometheus-snmp-config args;
flameshot = pkgs.libsForQt5.callPackage ./flameshot {};
flameshot = pkgs.callPackage ./flameshot {};
lukegb-wallpapers = pkgs.callPackage ./lukegb-wallpapers {};
rundeck-bin = pkgs.callPackage ./rundeck-bin {};
mercurial = pkgs.mercurialFull.withExtensions (pm: with pm; [
@ -51,7 +49,7 @@
nix = pkgs.lix;
};
lutris = pkgs.lutris.override {
extraPkgs = pkgs: with pkgs; [ openssl gnome.zenity ];
extraPkgs = pkgs: with pkgs; [ openssl zenity ];
};
vault-acme = pkgs.callPackage ./vault-acme { };
nixos-size = pkgs.callPackage ./nixos-size { };
@ -61,7 +59,7 @@
jj = import ./jj.nix args;
readsb = pkgs.callPackage ./readsb { };
mlat-client = pkgs.python3.pkgs.callPackage ./mlat-client { };
mlat-client = pkgs.python311.pkgs.callPackage ./mlat-client { };
tcllauncher = pkgs.callPackage ./piaware/tcllauncher.nix { };
piaware = pkgs.callPackage ./piaware/piaware.nix { inherit tcllauncher faup1090 mlat-client; };
faup1090 = pkgs.callPackage ./piaware/faup1090.nix { };

31
nix/pkgs/django-allauth.nix
View file

@ -1,31 +0,0 @@
{ lib, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib
, django, python3-openid, mock, coverage, pyjwt }:
buildPythonPackage rec {
pname = "django-allauth";
version = "0.44.0";
# no tests on PyPI
src = fetchFromGitHub {
owner = "pennersr";
repo = pname;
rev = version;
sha256 = "sha256:0fjaf6cnz08dvkribjjsmw0a0yyi6a9s3m1mmsrq2fmmdq6n031q";
};
propagatedBuildInputs = [ requests requests_oauthlib django python3-openid pyjwt ];
checkInputs = [ coverage mock ];
doCheck = false;
checkPhase = ''
cd $NIX_BUILD_TOP/$sourceRoot
coverage run manage.py test allauth
'';
meta = with lib; {
description = "Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication";
homepage = "https://www.intenct.nl/projects/django-allauth";
license = licenses.mit;
};
}

16
nix/pkgs/django-tailwind.nix
View file

@ -2,21 +2,17 @@
buildPythonPackage rec {
pname = "django-tailwind";
version = "2.0.1";
version = "3.8.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "sha256:187alssasfmnbq1rdhgs8np1j494mcgndxx7cw3lyyzqmkrsn0c2";
pname = "django_tailwind";
inherit version;
sha256 = "sha256-McL0p4edaFwt4P6vC2PyRiALNzN76k19uvtZvD8QwAg=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'cookiecutter = "^1.7.2"' 'cookiecutter = ">=1.7.2"'
'';
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [ django cookiecutter ];
format = "pyproject";
propagatedBuildInputs = [ django ];
doCheck = false;

58
nix/pkgs/flameshot/add-fup.patch
View file

@ -1,22 +1,26 @@
commit eb9decd62bafcc9f776a66661613ae6a4a26a87d
commit 99e3349bf64e2c651e5e3c4c78b3858632c71fea
Author: Luke Granger-Brown <git@lukegb.com>
Date: Sat Sep 17 19:52:26 2022 +0100
Date: Sun Aug 4 00:56:02 2024 +0100
Add fup support
Add fup upload support
diff --git a/src/config/generalconf.cpp b/src/config/generalconf.cpp
index 30020f7d..2159eedb 100644
index 8c8024de..9e1883b8 100644
--- a/src/config/generalconf.cpp
+++ b/src/config/generalconf.cpp
@@ -50,6 +50,7 @@ GeneralConf::GeneralConf(QWidget* parent)
@@ -57,6 +57,11 @@ GeneralConf::GeneralConf(QWidget* parent)
initUploadHistoryMax();
initUndoLimit();
initUploadClientSecret();
+ initFupUploadClientSecret();
initAllowMultipleGuiInstances();
#if !defined(Q_OS_WIN)
initAutoCloseIdleDaemon();
@@ -561,6 +562,31 @@ void GeneralConf::uploadClientKeyEdited()
+ initAllowMultipleGuiInstances();
+#if !defined(Q_OS_WIN)
+ initAutoCloseIdleDaemon();
+#endif
initPredefinedColorPaletteLarge();
initShowSelectionGeometry();
@@ -573,6 +578,31 @@ void GeneralConf::uploadClientKeyEdited()
ConfigHandler().setUploadClientSecret(m_uploadClientKey->text());
}
@ -49,26 +53,26 @@ index 30020f7d..2159eedb 100644
{
ConfigHandler().setUploadHistoryMax(max);
diff --git a/src/config/generalconf.h b/src/config/generalconf.h
index a1178cf5..c55a0635 100644
index e1f49791..b49a876a 100644
--- a/src/config/generalconf.h
+++ b/src/config/generalconf.h
@@ -42,6 +42,7 @@ private slots:
@@ -53,6 +53,7 @@ private slots:
void resetConfiguration();
void togglePathFixed();
void uploadClientKeyEdited();
+ void fupUploadClientKeyEdited();
void useJpgForClipboardChanged(bool checked);
void setSaveAsFileExtension(QString extension);
@@ -73,6 +74,7 @@ private:
void setSaveAsFileExtension(const QString& extension);
void setGeometryLocation(int index);
@@ -89,6 +90,7 @@ private:
void initUseJpgForClipboard();
void initUploadHistoryMax();
void initUploadClientSecret();
+ void initFupUploadClientSecret();
void initSaveLastRegion();
void _updateComponents(bool allowEmptySavePath);
@@ -101,6 +103,7 @@ private:
void initShowSelectionGeometry();
void initJpegQuality();
@@ -121,6 +123,7 @@ private:
QCheckBox* m_saveAfterCopy;
QLineEdit* m_savePath;
QLineEdit* m_uploadClientKey;
@ -77,7 +81,7 @@ index a1178cf5..c55a0635 100644
QCheckBox* m_screenshotPathFixedCheck;
QCheckBox* m_historyConfirmationToDelete;
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 95a13ccd..3618da5d 100644
index d2a62924..eea75beb 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -10,6 +10,8 @@ target_sources(
@ -250,26 +254,26 @@ index 00000000..4748ada9
+ QNetworkAccessManager* m_NetworkAM;
+};
diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp
index 657e8963..ef13ab93 100644
index 485fb265..ba6e44eb 100644
--- a/src/utils/confighandler.cpp
+++ b/src/utils/confighandler.cpp
@@ -121,6 +121,7 @@ static QMap<class QString, QSharedPointer<ValueHandler>>
@@ -124,6 +124,7 @@ static QMap<class QString, QSharedPointer<ValueHandler>>
// drawFontSize, remember to update ConfigHandler::toolSize
OPTION("copyOnDoubleClick" ,Bool ( false )),
OPTION("uploadClientSecret" ,String ( "313baf0c7b4d3ff" )),
+ OPTION("fupUploadClientSecret" ,String ( "" )),
};
static QMap<QString, QSharedPointer<KeySequence>> recognizedShortcuts = {
OPTION("showSelectionGeometry" , BoundedInt (0,5,4)),
OPTION("showSelectionGeometryHideTime", LowerBoundedInt (0, 3000)),
OPTION("jpegQuality", BoundedInt (0,100,75))
diff --git a/src/utils/confighandler.h b/src/utils/confighandler.h
index 3be5953a..7b67e1e1 100644
index f2eb4ad9..16b7126f 100644
--- a/src/utils/confighandler.h
+++ b/src/utils/confighandler.h
@@ -119,6 +119,7 @@ public:
@@ -125,6 +125,7 @@ public:
CONFIG_GETTER_SETTER(squareMagnifier, setSquareMagnifier, bool)
CONFIG_GETTER_SETTER(copyOnDoubleClick, setCopyOnDoubleClick, bool)
CONFIG_GETTER_SETTER(uploadClientSecret, setUploadClientSecret, QString)
+ CONFIG_GETTER_SETTER(fupUploadClientSecret, setFupUploadClientSecret, QString)
CONFIG_GETTER_SETTER(saveLastRegion, setSaveLastRegion, bool)
// SPECIAL CASES
bool startupLaunch();
CONFIG_GETTER_SETTER(showSelectionGeometry, setShowSelectionGeometry, int)
CONFIG_GETTER_SETTER(jpegQuality, setJpegQuality, int)

41
web/quotes/default.nix
View file

@ -1,15 +1,17 @@
{ depot, pkgs, ... }:
let
python = pkgs.python3.withPackages (ps: with ps; [
django_3
python = pkgs.python3.withPackages (ps: with ps; let
django = django_4;
in [
django
gunicorn
psycopg2
(depot.pkgs.django-allauth.override {
django = django_3;
(django-allauth.override {
inherit django;
})
(depot.pkgs.django-tailwind.override {
django = django_3;
inherit django;
})
]);
@ -17,19 +19,42 @@ let
baseNameOf path != "__pycache__" &&
baseNameOf path != "node_modules" &&
true));
src = builtins.filterSource filterSourcePred ./.;
nodeDeps = pkgs.buildNpmPackage rec {
name = "quotes_node_deps";
inherit src;
sourceRoot = "quotes/theme/static_src";
npmDeps = pkgs.importNpmLock {
npmRoot = builtins.filterSource (path: type: baseNameOf path == "package.json" || baseNameOf path == "package-lock.json") ./theme/static_src;
};
npmConfigHook = pkgs.importNpmLock.npmConfigHook;
dontNpmBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/lib
cp -R node_modules $out/lib/node_modules
runHook postInstall
'';
};
in
pkgs.stdenvNoCC.mkDerivation rec {
name = "quotes";
src = builtins.filterSource filterSourcePred ./.;
inherit src;
buildInputs = with pkgs; [ makeWrapper nodejs ];
propagatedBuildInputs = [ python ];
nodeModules = (import ./node-default.nix { inherit pkgs; nodejs = pkgs.nodejs-18_x; }).shell.nodeDependencies;
inherit nodeDeps;
buildPhase = ''
cp -R $nodeModules/lib/node_modules theme/static_src/node_modules
cp -R $nodeDeps/lib/node_modules theme/static_src/node_modules
'';
installPhase = ''
sitepkgdir="$out/lib/${python.libPrefix}/site-packages"

17
web/quotes/node-default.nix
View file

@ -1,17 +0,0 @@
# This file has been generated by node2nix 1.11.1. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}:
let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}

598
web/quotes/node-env.nix
View file

@ -1,598 +0,0 @@
# This file originates from node2nix
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
let
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
python = if nodejs ? python then nodejs.python else python2;
# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
tarWrapper = runCommand "tarWrapper" {} ''
mkdir -p $out/bin
cat > $out/bin/tar <<EOF
#! ${stdenv.shell} -e
$(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore
EOF
chmod +x $out/bin/tar
'';
# Function that generates a TGZ file from a NPM project
buildNodeSourceDist =
{ name, version, src, ... }:
stdenv.mkDerivation {
name = "node-tarball-${name}-${version}";
inherit src;
buildInputs = [ nodejs ];
buildPhase = ''
export HOME=$TMPDIR
tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts)
'';
installPhase = ''
mkdir -p $out/tarballs
mv $tgzFile $out/tarballs
mkdir -p $out/nix-support
echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products
'';
};
# Common shell logic
installPackage = writeShellScript "install-package" ''
installPackage() {
local packageName=$1 src=$2
local strippedName
local DIR=$PWD
cd $TMPDIR
unpackFile $src
# Make the base dir in which the target dependency resides first
mkdir -p "$(dirname "$DIR/$packageName")"
if [ -f "$src" ]
then
# Figure out what directory has been unpacked
packageDir="$(find . -maxdepth 1 -type d | tail -1)"
# Restore write permissions to make building work
find "$packageDir" -type d -exec chmod u+x {} \;
chmod -R u+w "$packageDir"
# Move the extracted tarball into the output folder
mv "$packageDir" "$DIR/$packageName"
elif [ -d "$src" ]
then
# Get a stripped name (without hash) of the source directory.
# On old nixpkgs it's already set internally.
if [ -z "$strippedName" ]
then
strippedName="$(stripHash $src)"
fi
# Restore write permissions to make building work
chmod -R u+w "$strippedName"
# Move the extracted directory into the output folder
mv "$strippedName" "$DIR/$packageName"
fi
# Change to the package directory to install dependencies
cd "$DIR/$packageName"
}
'';
# Bundle the dependencies of the package
#
# Only include dependencies if they don't exist. They may also be bundled in the package.
includeDependencies = {dependencies}:
lib.optionalString (dependencies != []) (
''
mkdir -p node_modules
cd node_modules
''
+ (lib.concatMapStrings (dependency:
''
if [ ! -e "${dependency.packageName}" ]; then
${composePackage dependency}
fi
''
) dependencies)
+ ''
cd ..
''
);
# Recursively composes the dependencies of a package
composePackage = { name, packageName, src, dependencies ? [], ... }@args:
builtins.addErrorContext "while evaluating node package '${packageName}'" ''
installPackage "${packageName}" "${src}"
${includeDependencies { inherit dependencies; }}
cd ..
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
'';
pinpointDependencies = {dependencies, production}:
let
pinpointDependenciesFromPackageJSON = writeTextFile {
name = "pinpointDependencies.js";
text = ''
var fs = require('fs');
var path = require('path');
function resolveDependencyVersion(location, name) {
if(location == process.env['NIX_STORE']) {
return null;
} else {
var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
if(fs.existsSync(dependencyPackageJSON)) {
var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
if(dependencyPackageObj.name == name) {
return dependencyPackageObj.version;
}
} else {
return resolveDependencyVersion(path.resolve(location, ".."), name);
}
}
}
function replaceDependencies(dependencies) {
if(typeof dependencies == "object" && dependencies !== null) {
for(var dependency in dependencies) {
var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
if(resolvedVersion === null) {
process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
} else {
dependencies[dependency] = resolvedVersion;
}
}
}
}
/* Read the package.json configuration */
var packageObj = JSON.parse(fs.readFileSync('./package.json'));
/* Pinpoint all dependencies */
replaceDependencies(packageObj.dependencies);
if(process.argv[2] == "development") {
replaceDependencies(packageObj.devDependencies);
}
replaceDependencies(packageObj.optionalDependencies);
/* Write the fixed package.json file */
fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
'';
};
in
''
node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
${lib.optionalString (dependencies != [])
''
if [ -d node_modules ]
then
cd node_modules
${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
cd ..
fi
''}
'';
# Recursively traverses all dependencies of a package and pinpoints all
# dependencies in the package.json file to the versions that are actually
# being used.
pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
''
if [ -d "${packageName}" ]
then
cd "${packageName}"
${pinpointDependencies { inherit dependencies production; }}
cd ..
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
fi
'';
# Extract the Node.js source code which is used to compile packages with
# native bindings
nodeSources = runCommand "node-sources" {} ''
tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
mv node-* $out
'';
# Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
addIntegrityFieldsScript = writeTextFile {
name = "addintegrityfields.js";
text = ''
var fs = require('fs');
var path = require('path');
function augmentDependencies(baseDir, dependencies) {
for(var dependencyName in dependencies) {
var dependency = dependencies[dependencyName];
// Open package.json and augment metadata fields
var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
var packageJSONPath = path.join(packageJSONDir, "package.json");
if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
console.log("Adding metadata fields to: "+packageJSONPath);
var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
if(dependency.integrity) {
packageObj["_integrity"] = dependency.integrity;
} else {
packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
}
if(dependency.resolved) {
packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided
} else {
packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
}
if(dependency.from !== undefined) { // Adopt from property if one has been provided
packageObj["_from"] = dependency.from;
}
fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
}
// Augment transitive dependencies
if(dependency.dependencies !== undefined) {
augmentDependencies(packageJSONDir, dependency.dependencies);
}
}
}
if(fs.existsSync("./package-lock.json")) {
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
if(![1, 2].includes(packageLock.lockfileVersion)) {
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
process.exit(1);
}
if(packageLock.dependencies !== undefined) {
augmentDependencies(".", packageLock.dependencies);
}
}
'';
};
# Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
reconstructPackageLock = writeTextFile {
name = "addintegrityfields.js";
text = ''
var fs = require('fs');
var path = require('path');
var packageObj = JSON.parse(fs.readFileSync("package.json"));
var lockObj = {
name: packageObj.name,
version: packageObj.version,
lockfileVersion: 1,
requires: true,
dependencies: {}
};
function augmentPackageJSON(filePath, dependencies) {
var packageJSON = path.join(filePath, "package.json");
if(fs.existsSync(packageJSON)) {
var packageObj = JSON.parse(fs.readFileSync(packageJSON));
dependencies[packageObj.name] = {
version: packageObj.version,
integrity: "sha1-000000000000000000000000000=",
dependencies: {}
};
processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
}
}
function processDependencies(dir, dependencies) {
if(fs.existsSync(dir)) {
var files = fs.readdirSync(dir);
files.forEach(function(entry) {
var filePath = path.join(dir, entry);
var stats = fs.statSync(filePath);
if(stats.isDirectory()) {
if(entry.substr(0, 1) == "@") {
// When we encounter a namespace folder, augment all packages belonging to the scope
var pkgFiles = fs.readdirSync(filePath);
pkgFiles.forEach(function(entry) {
if(stats.isDirectory()) {
var pkgFilePath = path.join(filePath, entry);
augmentPackageJSON(pkgFilePath, dependencies);
}
});
} else {
augmentPackageJSON(filePath, dependencies);
}
}
});
}
}
processDependencies("node_modules", lockObj.dependencies);
fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
'';
};
prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
let
forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
in
''
# Pinpoint the versions of all dependencies to the ones that are actually being used
echo "pinpointing versions of dependencies..."
source $pinpointDependenciesScriptPath
# Patch the shebangs of the bundled modules to prevent them from
# calling executables outside the Nix store as much as possible
patchShebangs .
# Deploy the Node.js package by running npm install. Since the
# dependencies have been provided already by ourselves, it should not
# attempt to install them again, which is good, because we want to make
# it Nix's responsibility. If it needs to install any dependencies
# anyway (e.g. because the dependency parameters are
# incomplete/incorrect), it fails.
#
# The other responsibilities of NPM are kept -- version checks, build
# steps, postprocessing etc.
export HOME=$TMPDIR
cd "${packageName}"
runHook preRebuild
${lib.optionalString bypassCache ''
${lib.optionalString reconstructLock ''
if [ -f package-lock.json ]
then
echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
rm package-lock.json
else
echo "No package-lock.json file found, reconstructing..."
fi
node ${reconstructPackageLock}
''}
node ${addIntegrityFieldsScript}
''}
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
if [ "''${dontNpmInstall-}" != "1" ]
then
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
rm -f npm-shrinkwrap.json
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
fi
'';
# Builds and composes an NPM package including all its dependencies
buildNodePackage =
{ name
, packageName
, version ? null
, dependencies ? []
, buildInputs ? []
, production ? true
, npmFlags ? ""
, dontNpmInstall ? false
, bypassCache ? false
, reconstructLock ? false
, preRebuild ? ""
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
, meta ? {}
, ... }@args:
let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
in
stdenv.mkDerivation ({
name = "${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isDarwin) libtool
++ buildInputs;
inherit nodejs;
inherit dontStrip; # Stripping may fail a build for some package deployments
inherit dontNpmInstall preRebuild unpackPhase buildPhase;
compositionScript = composePackage args;
pinpointDependenciesScript = pinpointDependenciesOfPackage args;
passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
installPhase = ''
source ${installPackage}
# Create and enter a root node_modules/ folder
mkdir -p $out/lib/node_modules
cd $out/lib/node_modules
# Compose the package and all its dependencies
source $compositionScriptPath
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
# Create symlink to the deployed executable folder, if applicable
if [ -d "$out/lib/node_modules/.bin" ]
then
ln -s $out/lib/node_modules/.bin $out/bin
# Patch the shebang lines of all the executables
ls $out/bin/* | while read i
do
file="$(readlink -f "$i")"
chmod u+rwx "$file"
patchShebangs "$file"
done
fi
# Create symlinks to the deployed manual page folders, if applicable
if [ -d "$out/lib/node_modules/${packageName}/man" ]
then
mkdir -p $out/share
for dir in "$out/lib/node_modules/${packageName}/man/"*
do
mkdir -p $out/share/man/$(basename "$dir")
for page in "$dir"/*
do
ln -s $page $out/share/man/$(basename "$dir")
done
done
fi
# Run post install hook, if provided
runHook postInstall
'';
meta = {
# default to Node.js' platforms
platforms = nodejs.meta.platforms;
} // meta;
} // extraArgs);
# Builds a node environment (a node_modules folder and a set of binaries)
buildNodeDependencies =
{ name
, packageName
, version ? null
, src
, dependencies ? []
, buildInputs ? []
, production ? true
, npmFlags ? ""
, dontNpmInstall ? false
, bypassCache ? false
, reconstructLock ? false
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
, ... }@args:
let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
in
stdenv.mkDerivation ({
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isDarwin) libtool
++ buildInputs;
inherit dontStrip; # Stripping may fail a build for some package deployments
inherit dontNpmInstall unpackPhase buildPhase;
includeScript = includeDependencies { inherit dependencies; };
pinpointDependenciesScript = pinpointDependenciesOfPackage args;
passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
installPhase = ''
source ${installPackage}
mkdir -p $out/${packageName}
cd $out/${packageName}
source $includeScriptPath
# Create fake package.json to make the npm commands work properly
cp ${src}/package.json .
chmod 644 package.json
${lib.optionalString bypassCache ''
if [ -f ${src}/package-lock.json ]
then
cp ${src}/package-lock.json .
chmod 644 package-lock.json
fi
''}
# Go to the parent folder to make sure that all packages are pinpointed
cd ..
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
# Expose the executables that were installed
cd ..
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
mv ${packageName} lib
ln -s $out/lib/node_modules/.bin $out/bin
'';
} // extraArgs);
# Builds a development shell
buildNodeShell =
{ name
, packageName
, version ? null
, src
, dependencies ? []
, buildInputs ? []
, production ? true
, npmFlags ? ""
, dontNpmInstall ? false
, bypassCache ? false
, reconstructLock ? false
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
, ... }@args:
let
nodeDependencies = buildNodeDependencies args;
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
in
stdenv.mkDerivation ({
name = "node-shell-${name}${if version == null then "" else "-${version}"}";
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
buildCommand = ''
mkdir -p $out/bin
cat > $out/bin/shell <<EOF
#! ${stdenv.shell} -e
$shellHook
exec ${stdenv.shell}
EOF
chmod +x $out/bin/shell
'';
# Provide the dependencies in a development shell through the NODE_PATH environment variable
inherit nodeDependencies;
shellHook = lib.optionalString (dependencies != []) ''
export NODE_PATH=${nodeDependencies}/lib/node_modules
export PATH="${nodeDependencies}/bin:$PATH"
'';
} // extraArgs);
in
{
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
buildNodePackage = lib.makeOverridable buildNodePackage;
buildNodeDependencies = lib.makeOverridable buildNodeDependencies;
buildNodeShell = lib.makeOverridable buildNodeShell;
}

4681
web/quotes/node-packages.nix
View file

File diff suppressed because it is too large Load diff

1
web/quotes/quotesapp/settings.py
View file

@ -60,6 +60,7 @@ MIDDLEWARE = [
"django.contrib.auth.middleware.AuthenticationMiddleware",
"django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware",
"allauth.account.middleware.AccountMiddleware",
"quotes.quotesapp.middleware.LoginRequiredMiddleware",
]

2
web/quotes/theme/static_src/bs.config.js
View file

@ -22,6 +22,6 @@ module.exports = {
reloadOnRestart: true,
files: [
'../static/css/dist/styles.css',
...tailwindConfig.purge
...tailwindConfig.content,
]
};

6949
web/quotes/theme/static_src/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

14
web/quotes/theme/static_src/package.json
View file

@ -17,22 +17,22 @@
"author": "",
"license": "MIT",
"devDependencies": {
"@tailwindcss/aspect-ratio": "^0.2.0",
"@tailwindcss/forms": "^0.3.2",
"@tailwindcss/line-clamp": "^0.2.0",
"@tailwindcss/typography": "^0.4.0",
"autoprefixer": "^10.2.5",
"@tailwindcss/aspect-ratio": "^0.4.2",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/line-clamp": "^0.4.4",
"@tailwindcss/typography": "^0.5.13",
"autoprefixer": "^10.4.20",
"browser-sync": "^2.26.14",
"clean-css-cli": "^5.2.2",
"cross-env": "^7.0.3",
"nodemon": "^2.0.7",
"npm-run-all": "^4.1.5",
"postcss": "^8.2.9",
"postcss": "^8.4.40",
"postcss-cli": "^8.3.1",
"postcss-import": "^14.0.1",
"postcss-nested": "^5.0.5",
"postcss-simple-vars": "^6.0.3",
"rimraf": "^3.0.2",
"tailwindcss": "^2.1.1"
"tailwindcss": "^3.4.7"
}
}

11
web/quotes/theme/static_src/tailwind.config.js
View file

@ -6,15 +6,7 @@
*/
module.exports = {
/**
* Stylesheet generation mode.
*
* Set mode to "jit" if you want to generate your styles on-demand as you author your templates;
* Set mode to "aot" if you want to generate the stylesheet in advance and purge later (aka legacy mode).
*/
mode: "jit",
purge: [
content: [
/**
* HTML. Paths to Django template files that will contain Tailwind CSS classes.
*/
@ -49,7 +41,6 @@ module.exports = {
*/
// '../../**/*.py'
],
darkMode: false, // or 'media' or 'class'
theme: {
extend: {
colors: {