format all
This commit is contained in:
@@ -1,4 +1,8 @@
|
||||
{ lib, buildNpmPackage, fetchFromGitHub }:
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "adam-site";
|
||||
version = "1.0.0";
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ lib
|
||||
, buildDotnetGlobalTool
|
||||
, dotnetCorePackages
|
||||
, versionCheckHook
|
||||
, nix-update-script
|
||||
,
|
||||
{
|
||||
lib,
|
||||
buildDotnetGlobalTool,
|
||||
dotnetCorePackages,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
inherit (dotnetCorePackages) sdk_8_0;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ pkgs, ... }: rec {
|
||||
{ pkgs, ... }:
|
||||
rec {
|
||||
adam-site = pkgs.callPackage ./adam-site/default.nix { };
|
||||
ente-frontend = pkgs.callPackage ./ente-frontend/default.nix { };
|
||||
kop-fhcalendar = pkgs.callPackage ./kop-fhcalendar/default.nix { };
|
||||
@@ -6,18 +7,24 @@
|
||||
kop-hub = pkgs.callPackage ./hub/default.nix { };
|
||||
kop-monitor = pkgs.callPackage ./kop-monitor/default.nix { };
|
||||
kop-newproject = pkgs.callPackage ./kop-newproject/default.nix { };
|
||||
kop-website =
|
||||
pkgs.callPackage ./website/default.nix { inherit kop-hub ente-frontend; };
|
||||
kop-website = pkgs.callPackage ./website/default.nix { inherit kop-hub ente-frontend; };
|
||||
scheibnkleister-presence = pkgs.callPackage ./scheibnkleister-presence/default.nix { };
|
||||
custom-sddm-astronaut = pkgs.callPackage ./sddm-astronaut/default.nix { };
|
||||
mangal-patched = pkgs.callPackage ./mangal/default.nix { };
|
||||
csharp-ls-8 = pkgs.callPackage ./csharp-lsp/default.nix { };
|
||||
gpu-screen-recorder-ui = pkgs.callPackage ./gpu-screen-recorder-ui/default.nix { };
|
||||
gpu-screen-recorder-notification = pkgs.callPackage ./gpu-screen-recorder-notification/default.nix { };
|
||||
gpu-screen-recorder-notification =
|
||||
pkgs.callPackage ./gpu-screen-recorder-notification/default.nix
|
||||
{ };
|
||||
kavita-old = pkgs.callPackage ./kavita-old/default.nix { };
|
||||
hollow-grub = pkgs.callPackage ./hollow-grub/default.nix { };
|
||||
peframe = pkgs.callPackage ./peframe/default.nix { python3Packages = pkgs.python3Packages; inherit virustotal-api; };
|
||||
virustotal-api = pkgs.callPackage ./virustotal-api/default.nix { python3Packages = pkgs.python3Packages; };
|
||||
peframe = pkgs.callPackage ./peframe/default.nix {
|
||||
python3Packages = pkgs.python3Packages;
|
||||
inherit virustotal-api;
|
||||
};
|
||||
virustotal-api = pkgs.callPackage ./virustotal-api/default.nix {
|
||||
python3Packages = pkgs.python3Packages;
|
||||
};
|
||||
answer = pkgs.callPackage ./answer/default.nix { };
|
||||
internxt-cli = pkgs.callPackage ./internxt-cli/default.nix { };
|
||||
}
|
||||
|
||||
@@ -1,14 +1,21 @@
|
||||
{ lib, buildNpmPackage, fetchFromGitHub, npm-lockfile-fix }:
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
npm-lockfile-fix,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "ente-website";
|
||||
version = "1.0.0";
|
||||
|
||||
src = "${(fetchGit {
|
||||
url = "git@github.com:oberprofis/ente.git";
|
||||
ref = "master";
|
||||
rev = "cb63e1e20fd9fde401fa9d3f09b36c572b17ff34";
|
||||
})}/website/tracker-site";
|
||||
src = "${
|
||||
(fetchGit {
|
||||
url = "git@github.com:oberprofis/ente.git";
|
||||
ref = "master";
|
||||
rev = "cb63e1e20fd9fde401fa9d3f09b36c572b17ff34";
|
||||
})
|
||||
}/website/tracker-site";
|
||||
npmDepsHash = "sha256-fYTRhIU+8pdIm3wC5wJRcDUhgN3d+mmvfmVzuu0pjLQ=";
|
||||
|
||||
# The prepack script runs the build script, which we'd rather do in the build phase.
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
, libX11
|
||||
, libXrender
|
||||
, libXrandr
|
||||
, libXext
|
||||
, libglvnd
|
||||
, wayland
|
||||
, wayland-scanner
|
||||
, gitUpdater
|
||||
,
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
pkg-config,
|
||||
meson,
|
||||
ninja,
|
||||
libX11,
|
||||
libXrender,
|
||||
libXrandr,
|
||||
libXext,
|
||||
libglvnd,
|
||||
wayland,
|
||||
wayland-scanner,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, ...
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hub";
|
||||
|
||||
@@ -22,31 +22,33 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
# Tip: use diff <filea> <fileb> -ur to create patches
|
||||
patches = [ (pkgs.writeText "cli-patch" ''
|
||||
diff --git i/src/services/auth.service.ts w/src/services/auth.service.ts
|
||||
index dcc63bb..fae23b9 100644
|
||||
--- i/src/services/auth.service.ts
|
||||
+++ w/src/services/auth.service.ts
|
||||
@@ -29,14 +29,14 @@ export class AuthService {
|
||||
tfaCode: twoFactorCode,
|
||||
};
|
||||
|
||||
- const data = await authClient.loginAccess(loginDetails, CryptoService.cryptoProvider);
|
||||
+ const data = await authClient.login(loginDetails, CryptoService.cryptoProvider);
|
||||
const { user, newToken } = data;
|
||||
|
||||
const clearMnemonic = CryptoService.instance.decryptTextWithKey(user.mnemonic, password);
|
||||
- const clearUser: LoginCredentials['user'] = {
|
||||
- ...user,
|
||||
+ const clearUser: LoginCredentials['user'] = Object.assign({}, user, {
|
||||
+ createdAt: user.createdAt as any as string,
|
||||
mnemonic: clearMnemonic,
|
||||
- };
|
||||
+ });
|
||||
return {
|
||||
user: clearUser,
|
||||
token: newToken,
|
||||
'') ];
|
||||
patches = [
|
||||
(pkgs.writeText "cli-patch" ''
|
||||
diff --git i/src/services/auth.service.ts w/src/services/auth.service.ts
|
||||
index dcc63bb..fae23b9 100644
|
||||
--- i/src/services/auth.service.ts
|
||||
+++ w/src/services/auth.service.ts
|
||||
@@ -29,14 +29,14 @@ export class AuthService {
|
||||
tfaCode: twoFactorCode,
|
||||
};
|
||||
|
||||
- const data = await authClient.loginAccess(loginDetails, CryptoService.cryptoProvider);
|
||||
+ const data = await authClient.login(loginDetails, CryptoService.cryptoProvider);
|
||||
const { user, newToken } = data;
|
||||
|
||||
const clearMnemonic = CryptoService.instance.decryptTextWithKey(user.mnemonic, password);
|
||||
- const clearUser: LoginCredentials['user'] = {
|
||||
- ...user,
|
||||
+ const clearUser: LoginCredentials['user'] = Object.assign({}, user, {
|
||||
+ createdAt: user.createdAt as any as string,
|
||||
mnemonic: clearMnemonic,
|
||||
- };
|
||||
+ });
|
||||
return {
|
||||
user: clearUser,
|
||||
token: newToken,
|
||||
'')
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
cp .env.template .env
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
{ rustPlatform, lib, pkgs, ... }:
|
||||
{
|
||||
rustPlatform,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "kop-fhcalendar";
|
||||
version = "1.0.0";
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
{ buildGoModule, stdenv, pkgs, lib, ... }:
|
||||
{
|
||||
buildGoModule,
|
||||
stdenv,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "kop-fileshare";
|
||||
version = "0.0.1";
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
{ rustPlatform
|
||||
, lib
|
||||
, pkgs
|
||||
, ...
|
||||
{
|
||||
rustPlatform,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "kop-monitor";
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
{ rustPlatform, lib, pkgs, ... }:
|
||||
{
|
||||
rustPlatform,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "kop-newproject";
|
||||
version = "1.0.0";
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, libgbm
|
||||
, makeWrapper
|
||||
,
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
libgbm,
|
||||
makeWrapper,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
name = "mangal";
|
||||
@@ -27,7 +27,10 @@ buildGoModule rec {
|
||||
|
||||
buildInputs = [ libgbm ];
|
||||
runtimeDeps = [ libgbm ];
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/mangal --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libgbm ]}
|
||||
|
||||
@@ -1,36 +1,49 @@
|
||||
{lib, fetchPypi, python3Packages, swig, pkgconf, openssl, virustotal-api, ...}:
|
||||
{
|
||||
lib,
|
||||
fetchPypi,
|
||||
python3Packages,
|
||||
swig,
|
||||
pkgconf,
|
||||
openssl,
|
||||
virustotal-api,
|
||||
...
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "peframe_ds";
|
||||
version = "7.0.0";
|
||||
pyproject = true;
|
||||
pname = "peframe_ds";
|
||||
version = "7.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Z9/hMD3w4ZYcfPMbLUuyKhS1wWGT11Y3gdVNVqSdhvg=";
|
||||
};
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "readline" "gnureadline"
|
||||
'';
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Z9/hMD3w4ZYcfPMbLUuyKhS1wWGT11Y3gdVNVqSdhvg=";
|
||||
};
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "readline" "gnureadline"
|
||||
'';
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
pefile
|
||||
yara-python
|
||||
python-magic
|
||||
requests
|
||||
oletools
|
||||
m2crypto
|
||||
virustotal-api
|
||||
gnureadline
|
||||
];
|
||||
dependencies = with python3Packages; [
|
||||
pefile
|
||||
yara-python
|
||||
python-magic
|
||||
requests
|
||||
oletools
|
||||
m2crypto
|
||||
virustotal-api
|
||||
gnureadline
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ swig pkgconf openssl ];
|
||||
nativeBuildInputs = [
|
||||
swig
|
||||
pkgconf
|
||||
openssl
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "PEframe — static analysis of PE files and suspicious documents";
|
||||
homepage = "https://github.com/guelfoweb/peframe";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "PEframe — static analysis of PE files and suspicious documents";
|
||||
homepage = "https://github.com/guelfoweb/peframe";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
{ buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, ...
|
||||
{
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "scheibnkleister-presence";
|
||||
|
||||
@@ -9,15 +9,17 @@ pkgs.stdenv.mkDerivation {
|
||||
rev = "6726b5e951a13d308bf17aa09e91a349d82c997b";
|
||||
};
|
||||
# Tip: use diff <filea> <fileb> -ur to create patches
|
||||
patches = [ (pkgs.writeText "astronaut-patch" ''
|
||||
--- a/metadata.desktop
|
||||
+++ b/metadata.desktop
|
||||
@@ -9,3 +9,4 @@
|
||||
MainScript=Main.qml
|
||||
ConfigFile=theme.conf
|
||||
Theme-Id=sddm-astronaut
|
||||
+QTVersion=6
|
||||
'') ];
|
||||
patches = [
|
||||
(pkgs.writeText "astronaut-patch" ''
|
||||
--- a/metadata.desktop
|
||||
+++ b/metadata.desktop
|
||||
@@ -9,3 +9,4 @@
|
||||
MainScript=Main.qml
|
||||
ConfigFile=theme.conf
|
||||
Theme-Id=sddm-astronaut
|
||||
+QTVersion=6
|
||||
'')
|
||||
];
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -R ./* $out/
|
||||
|
||||
@@ -1,4 +1,11 @@
|
||||
{ stdenv, lib, buildNpmPackage, fetchFromGitHub, kop-hub, ente-frontend }:
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
kop-hub,
|
||||
ente-frontend,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kopatz-website";
|
||||
|
||||
Reference in New Issue
Block a user