i can't remember what caused this...
This commit is contained in:
@@ -8,4 +8,6 @@
|
||||
kobopatch = pkgs.callPackage ./kobopatch.nix { };
|
||||
my-mautrix-discord = pkgs.callPackage ./mautrix-discord.nix { }; # Handled by matrix-appservices input
|
||||
ulogger-server = pkgs.callPackage ./ulogger.nix { };
|
||||
my-wallabag = pkgs.callPackage ./wallabag.nix { };
|
||||
mautrix-slack = pkgs.callPackage ./mautrix-slack.nix { };
|
||||
}
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ buildGoModule rec {
|
||||
name = "koboutils";
|
||||
version = "git_2020-04-08";
|
||||
|
||||
vendorSha256 = "1hqvizvbc29yib6awmvlklxkq7j8c0d32gxsipdiwhkh79xbd6wq";
|
||||
vendorha256 = "1hqvizvbc29yib6awmvlklxkq7j8c0d32gxsipdiwhkh79xbd6wq";
|
||||
deleteVendor = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, olm }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-discord";
|
||||
version = "unstable-2022-11-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "slack";
|
||||
rev = "4530ff397d08d93b673cd71da4c2a75d969ca0df";
|
||||
hash = "";
|
||||
};
|
||||
|
||||
buildInputs = [ olm ];
|
||||
|
||||
vendorHash = "sha256-yday2mSnPwuhXWkCG4XY7qoBl3DXHcSvzBoZbjgYz/c=";
|
||||
|
||||
ldflags = [ "-s" "-w" ]; # https://github.com/NixOS/nixpkgs/issues/177698
|
||||
|
||||
doCheck = false; # No tests available
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://go.mau.fi/mautrix-slack";
|
||||
description = "Matrix to Slack hybrid puppeting/relaybot bridge";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
+2
-2
@@ -10,7 +10,7 @@ pkgs.stdenv.mkDerivation rec {
|
||||
};
|
||||
buildInputs = with pkgs; [
|
||||
gcc
|
||||
pkgconfig
|
||||
pkg-config
|
||||
autoconf
|
||||
automake
|
||||
libtool
|
||||
@@ -27,7 +27,7 @@ pkgs.stdenv.mkDerivation rec {
|
||||
gtk3-x11
|
||||
cmake
|
||||
cmakeCurses
|
||||
elementary-cmake-modules
|
||||
# elementary-cmake-modules
|
||||
extra-cmake-modules
|
||||
libglvnd
|
||||
mesa_glu
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
diff --git a/app/AppKernel.php b/app/AppKernel.php
|
||||
index 61b734e06..d25d1aaa3 100644
|
||||
--- a/app/AppKernel.php
|
||||
+++ b/app/AppKernel.php
|
||||
@@ -62,14 +62,19 @@ class AppKernel extends Kernel
|
||||
return $bundles;
|
||||
}
|
||||
|
||||
+ public function getProjectDir()
|
||||
+ {
|
||||
+ return getenv('WALLABAG_DATA') ?: dirname(__DIR__);
|
||||
+ }
|
||||
+
|
||||
public function getCacheDir()
|
||||
{
|
||||
- return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
|
||||
+ return $this->getProjectDir() . '/var/cache/' . $this->getEnvironment();
|
||||
}
|
||||
|
||||
public function getLogDir()
|
||||
{
|
||||
- return dirname(__DIR__) . '/var/logs';
|
||||
+ return $this->getProjectDir() . '/var/logs';
|
||||
}
|
||||
|
||||
public function registerContainerConfiguration(LoaderInterface $loader)
|
||||
@@ -0,0 +1,57 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
# Point the environment variable $WALLABAG_DATA to a data directory
|
||||
# that contains the folder `app` which must be a clone of
|
||||
# wallabag's configuration files with your customized `parameters.yml`.
|
||||
# In practice you need to copy `${pkgs.wallabag}/app` and the
|
||||
# customizzed `parameters.yml` to $WALLABAG_DATA.
|
||||
# These need to be updated every package upgrade.
|
||||
#
|
||||
# After a package upgrade, empty the `var/cache` folder or unexpected
|
||||
# error will occur.
|
||||
|
||||
let
|
||||
pname = "wallabag";
|
||||
version = "2.6.8";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
# Release tarball includes vendored files
|
||||
src = fetchurl {
|
||||
url = "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz";
|
||||
hash = "sha256-pmQXafqpd5rTwBIYG9NnwIIPta6Ek7iYaPaHvz1s550=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./wallabag-data.patch # exposes $WALLABAG_DATA
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
cp -R * $out/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "wallabag is a self hostable application for saving web pages";
|
||||
longDescription = ''
|
||||
wallabag is a self-hostable PHP application allowing you to not
|
||||
miss any content anymore. Click, save and read it when you can.
|
||||
It extracts content so that you can read it when you have time.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
homepage = "http://wallabag.org";
|
||||
changelog = "https://github.com/wallabag/wallabag/releases/tag/${version}";
|
||||
maintainers = with maintainers; [ schneefux ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user