Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ac1bd5b1d436
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cf7f234ff54f
Choose a head ref
  • 7 commits
  • 11 files changed
  • 2 contributors

Commits on Mar 23, 2019

  1. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    2adf197 View commit details
  2. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    b8a7e78 View commit details
  3. statik: init at 2018-11-28

    Madouura committed Mar 23, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    1d4a995 View commit details
  4. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    40d7079 View commit details
  5. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    c66b062 View commit details
  6. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    8aa372c View commit details

Commits on Mar 24, 2019

  1. Merge pull request #57527 from Chiiruno/dev/meguca

    Init: statik, Update: easyjson, quicktemplate, meguca, hydron
    veprbl authored Mar 24, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    cf7f234 View commit details
20 changes: 18 additions & 2 deletions nixos/modules/services/web-servers/meguca.nix
Original file line number Diff line number Diff line change
@@ -86,11 +86,19 @@ in with lib; {
default = false;
description = "Serve and listen only through HTTPS.";
};

videoPaths = mkOption {
type = types.listOf types.path;
default = [];
example = [ "/home/okina/Videos/tehe_pero.webm" ];
description = "Videos that will be symlinked into www/videos.";
};
};

config = mkIf cfg.enable {
security.sudo.enable = cfg.enable;
services.postgresql.enable = cfg.enable;
services.postgresql.package = pkgs.postgresql_11;
services.meguca.passwordFile = mkDefault (pkgs.writeText "meguca-password-file" cfg.password);
services.meguca.postgresArgsFile = mkDefault (pkgs.writeText "meguca-postgres-args" cfg.postgresArgs);
services.meguca.postgresArgs = mkDefault "user=meguca password=${cfg.password} dbname=meguca sslmode=disable";
@@ -102,8 +110,16 @@ in with lib; {

preStart = ''
# Ensure folder exists or create it and links and permissions are correct
mkdir -p ${escapeShellArg cfg.dataDir}
ln -sf ${pkgs.meguca}/share/meguca/www ${escapeShellArg cfg.dataDir}
mkdir -p ${escapeShellArg cfg.dataDir}/www
rm -rf ${escapeShellArg cfg.dataDir}/www/videos
ln -sf ${pkgs.meguca}/share/meguca/www/* ${escapeShellArg cfg.dataDir}/www
unlink ${escapeShellArg cfg.dataDir}/www/videos
mkdir -p ${escapeShellArg cfg.dataDir}/www/videos
for vid in ${escapeShellArg cfg.videoPaths}; do
ln -sf $vid ${escapeShellArg cfg.dataDir}/www/videos
done
chmod 750 ${escapeShellArg cfg.dataDir}
chown -R meguca:meguca ${escapeShellArg cfg.dataDir}
6 changes: 3 additions & 3 deletions pkgs/development/tools/easyjson/default.nix
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

buildGoPackage rec {
name = "easyjson-unstable-${version}";
version = "2018-08-23";
version = "2019-02-21";
goPackagePath = "github.com/mailru/easyjson";
goDeps = ./deps.nix;

src = fetchFromGitHub {
owner = "mailru";
repo = "easyjson";
rev = "60711f1a8329503b04e1c88535f419d0bb440bff";
sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1";
rev = "6243d8e04c3f819e79757e8bc3faa15c3cb27003";
sha256 = "160sj5pq4bv9jshniimkd5f9zcg6xrbgb027lhr9l895nsv4dlib";
};

enableParallelBuilding = true;
2 changes: 1 addition & 1 deletion pkgs/development/tools/easyjson/deps.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkgs/development/tools/quicktemplate/default.nix
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

buildGoPackage rec {
name = "quicktemplate-unstable-${version}";
version = "2018-11-26";
version = "2019-01-31";
goPackagePath = "github.com/valyala/quicktemplate";
goDeps = ./deps.nix;

src = fetchFromGitHub {
owner = "valyala";
repo = "quicktemplate";
rev = "4c04039b1358b0f49af22a699f9193f05d80be40";
sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5";
rev = "d08324ac14fa81325830fae7eb30188ec68427f8";
sha256 = "0gpc1kcqvcn1f9mz2dww8bhrspnsk2fgxzvx398vy7a0xhxq8vhx";
};

enableParallelBuilding = true;
25 changes: 25 additions & 0 deletions pkgs/development/tools/statik/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:

buildGoPackage rec {
name = "statik-unstable-${version}";
version = "2018-11-28";
goPackagePath = "github.com/rakyll/statik";
goDeps = ./deps.nix;

src = fetchFromGitHub {
owner = "rakyll";
repo = "statik";
rev = "79258177a57a85a8ab2eca7ce0936aad80307f4e";
sha256 = "14wqh38a7dhm2jgr1lsl2wdvjmkgdapzl2z4a1vl7ncv3x43gkg5";
};

enableParallelBuilding = true;

meta = with stdenv.lib; {
homepage = "https://github.com/rakyll/statik";
description = "Embed files into a Go executable ";
license = licenses.asl20;
maintainers = with maintainers; [ chiiruno ];
platforms = platforms.all;
};
}
3 changes: 3 additions & 0 deletions pkgs/development/tools/statik/deps.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkgs/servers/hydron/default.nix
Original file line number Diff line number Diff line change
@@ -3,15 +3,15 @@

buildGoPackage rec {
name = "hydron-unstable-${version}";
version = "2018-10-08";
version = "2019-02-17";
goPackagePath = "github.com/bakape/hydron";
goDeps = ./deps.nix;

src = fetchFromGitHub {
owner = "bakape";
repo = "hydron";
rev = "0a834bcaf9af3a6bac8873fad981aa3736115258";
sha256 = "154s1jjcdcwaxial2gsxaqb8bc1hwagz844ld2jr928jxj7ffqww";
rev = "824789fb108966432e507143db39b358dd7ff233";
sha256 = "1xxykjf5iyavm12gd6nx4j8x2mlzzn7x8vm0j5009lsir98qr5zn";
};

enableParallelBuilding = true;
64 changes: 50 additions & 14 deletions pkgs/servers/hydron/deps.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 13 additions & 12 deletions pkgs/servers/meguca/default.nix
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cmake, ffmpeg-full, ghostscript
, graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten, opencv }:
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cmake, ffmpeg-full
, ghostscript, graphicsmagick, quicktemplate, go-bindata, easyjson
, nodePackages, emscripten, opencv, statik }:

buildGoPackage rec {
name = "meguca-unstable-${version}";
version = "2018-12-06";
version = "2019-03-12";
goPackagePath = "github.com/bakape/meguca";
goDeps = ./server_deps.nix;

src = fetchFromGitHub {
owner = "bakape";
repo = "meguca";
rev = "300b007cab238838f813faa9aad6abb3f22ad4d2";
sha256 = "1rvnvhkm8l7h9rvw9vr8pm1qrr3zz5x7vayaw0caqx99xlyp93r9";
rev = "21b08de09b38918061c5cd0bbd0dc9bcc1280525";
sha256 = "1nb3bf1bscbdma83sp9fbgvmxxlxh21j9h80wakfn85sndcrws5i";
fetchSubmodules = true;
};

enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten opencv ];

buildInputs = [
ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata
easyjson emscripten opencv statik
];

buildPhase = ''
export HOME=`pwd`
export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/server
cd $HOME/go/src/github.com/bakape/meguca
cd go/src/github.com/bakape/meguca
ln -sf ${nodePackages.meguca}/lib/node_modules/meguca/node_modules
sed -i "/npm install --progress false --depth 0/d" Makefile
make generate_clean
go generate meguca/...
go build -v -p $NIX_BUILD_CORES meguca
make -j $NIX_BUILD_CORES client
make -j $NIX_BUILD_CORES generate all
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
make -j $NIX_BUILD_CORES wasm
'';
Loading