···429429 helsinki-systems = {
430430 # Verify additions to this team with at least one already existing member of the team.
431431 members = [
432432- ajs124
433432 das_j
434433 ];
435434 scope = "Group registration for packages maintained by Helsinki Systems";
+20-8
nixos/modules/services/web-apps/miniflux.nix
···1616{
1717 options = {
1818 services.miniflux = {
1919- enable = mkEnableOption (lib.mdDoc "miniflux and creates a local postgres database for it");
1919+ enable = mkEnableOption (lib.mdDoc "miniflux");
20202121 package = mkPackageOption pkgs "miniflux" { };
2222+2323+ createDatabaseLocally = lib.mkOption {
2424+ type = lib.types.bool;
2525+ default = true;
2626+ description = ''
2727+ Whether a PostgreSQL database should be automatically created and
2828+ configured on the local host. If set to `false`, you need provision a
2929+ database yourself and make sure to create the hstore extension in it.
3030+ '';
3131+ };
22322333 config = mkOption {
2434 type = with types; attrsOf (oneOf [ str int ]);
···3848 '';
3949 };
40504141- adminCredentialsFile = mkOption {
5151+ adminCredentialsFile = mkOption {
4252 type = types.path;
4353 description = lib.mdDoc ''
4454 File containing the ADMIN_USERNAME and
···5161 };
52625363 config = mkIf cfg.enable {
5454- services.miniflux.config = {
6464+ services.miniflux.config = {
5565 LISTEN_ADDR = mkDefault defaultAddress;
5656- DATABASE_URL = "user=miniflux host=/run/postgresql dbname=miniflux";
6666+ DATABASE_URL = lib.mkIf cfg.createDatabaseLocally "user=miniflux host=/run/postgresql dbname=miniflux";
5767 RUN_MIGRATIONS = 1;
5868 CREATE_ADMIN = 1;
5969 };
60706161- services.postgresql = {
7171+ services.postgresql = lib.mkIf cfg.createDatabaseLocally {
6272 enable = true;
6373 ensureUsers = [ {
6474 name = "miniflux";
···6777 ensureDatabases = [ "miniflux" ];
6878 };
69797070- systemd.services.miniflux-dbsetup = {
8080+ systemd.services.miniflux-dbsetup = lib.mkIf cfg.createDatabaseLocally {
7181 description = "Miniflux database setup";
7282 requires = [ "postgresql.service" ];
7383 after = [ "network.target" "postgresql.service" ];
···8191 systemd.services.miniflux = {
8292 description = "Miniflux service";
8393 wantedBy = [ "multi-user.target" ];
8484- requires = [ "miniflux-dbsetup.service" ];
8585- after = [ "network.target" "postgresql.service" "miniflux-dbsetup.service" ];
9494+ requires = lib.optional cfg.createDatabaseLocally "miniflux-dbsetup.service";
9595+ after = [ "network.target" ]
9696+ ++ lib.optionals cfg.createDatabaseLocally [ "postgresql.service" "miniflux-dbsetup.service" ];
86978798 serviceConfig = {
8899 ExecStart = "${cfg.package}/bin/miniflux";
···129140 include "${pkgs.apparmorRulesFromClosure { name = "miniflux"; } cfg.package}"
130141 r ${cfg.package}/bin/miniflux,
131142 r @{sys}/kernel/mm/transparent_hugepage/hpage_pmd_size,
143143+ rw /run/miniflux/**,
132144 }
133145 '';
134146 };
···11+{ lib
22+, asciidoctor
33+, fetchFromGitLab
44+, ncurses
55+, stdenv
66+}:
77+88+stdenv.mkDerivation (finalAttrs: {
99+ pname = "galaxis";
1010+ version = "1.11";
1111+1212+ src = fetchFromGitLab {
1313+ owner = "esr";
1414+ repo = "galaxis";
1515+ rev = finalAttrs.version;
1616+ hash = "sha256-fSzifGoSdWyFGt99slzAsqCMDoeLbBqQGXujX8QAfGc=";
1717+ };
1818+1919+ outputs = [ "out" "man" ];
2020+2121+ nativeBuildInputs = [
2222+ asciidoctor
2323+ ];
2424+2525+ buildInputs = [
2626+ ncurses
2727+ ];
2828+2929+ strictDeps = true;
3030+3131+ makeFlags = [
3232+ "CC=${stdenv.cc.targetPrefix}cc"
3333+ "galaxis"
3434+ "galaxis.6"
3535+ ];
3636+3737+ postPatch = ''
3838+ sed -i -E '/[[:space:]]*xmlto/ s|xmlto|xmlto --skip-validation|' Makefile
3939+ '';
4040+4141+ # This is better than sed-patch the Makefile
4242+ installPhase = ''
4343+ runHook preInstall
4444+ mkdir -p $out/bin $man/share/man/man6
4545+ install -Dm755 galaxis -t $out/bin/
4646+ install -Dm644 galaxis.6 -t $man/share/man/man6
4747+ runHook postInstall
4848+ '';
4949+5050+ meta = {
5151+ description = "Rescue lifeboats lost in interstellar space";
5252+ longDescription = ''
5353+ Lifeboats from a crippled interstellar liner are adrift in a starfield. To
5454+ find them, you can place probes that look in all eight compass directions
5555+ and tell you how many lifeboats they see. If you drop a probe directly on
5656+ a lifeboat it will be revealed immediately. Your objective: find the
5757+ lifeboats as quickly as possible, before the stranded passengers run out
5858+ of oxygen!
5959+6060+ This is a UNIX-hosted, curses-based clone of the nifty little Macintosh
6161+ freeware game Galaxis. It doesn't have the super-simple, point-and-click
6262+ interface of the original, but compensates by automating away some of the
6363+ game's simpler deductions.
6464+ '';
6565+ homepage = "http://catb.org/~esr/galaxis/";
6666+ license = with lib.licenses; [ gpl2Plus ];
6767+ mainProgram = "galaxis";
6868+ maintainers = with lib.maintainers; [ AndersonTorres ];
6969+ platforms = lib.platforms.linux;
7070+ };
7171+})
···1515 buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json);
16161717 # the version of infisical
1818- version = "0.16.10";
1818+ version = "0.17.1";
19192020 # the platform-specific, statically linked binary
2121 src =
···11-{ lib, stdenv, fetchurl, ncurses, xmlto }:
22-33-with lib;
44-stdenv.mkDerivation rec {
55-66- pname = "galaxis";
77- version = "1.10";
88-99- src = fetchurl{
1010- url = "http://www.catb.org/~esr/galaxis/${pname}-${version}.tar.gz";
1111- sha256 = "1181x3z4r0794v2bkpigb5fablw1nayj42wvhy2am79p7j1iqq5r";
1212- };
1313-1414- buildInputs = [ ncurses xmlto ];
1515-1616- patchPhase = ''
1717- sed -i\
1818- -e 's|^install: galaxis\.6 uninstall|install: galaxis.6|'\
1919- -e 's|usr/||g' -e 's|ROOT|DESTDIR|g'\
2020- -e 's|install -m 755 -o 0 -g 0|install -m 755|' Makefile
2121- '';
2222-2323- dontConfigure = true;
2424-2525- makeFlags = [ "DESTDIR=$(out)" ];
2626-2727- meta = {
2828- description = "Rescue lifeboats lost in interstellar space";
2929- longDescription = ''
3030- Lifeboats from a crippled interstellar liner are adrift in a starfield. To
3131- find them, you can place probes that look in all eight compass directions
3232- and tell you how many lifeboats they see. If you drop a probe directly on
3333- a lifeboat it will be revealed immediately. Your objective: find the
3434- lifeboats as quickly as possible, before the stranded passengers run out
3535- of oxygen!
3636-3737- This is a UNIX-hosted, curses-based clone of the nifty little Macintosh
3838- freeware game Galaxis. It doesn't have the super-simple, point-and-click
3939- interface of the original, but compensates by automating away some of the
4040- game's simpler deductions.
4141- '';
4242- homepage = "http://catb.org/~esr/galaxis/";
4343- license = licenses.gpl2;
4444- maintainers = [ maintainers.AndersonTorres ];
4545- platforms = platforms.linux;
4646- };
4747-}
···1212 pkgs = releaseLib.pkgsForCross crossSystem system;
1313 };
1414in lib.mapAttrs (n: make) (with lib.systems.examples; {
1515- # NOTE: Only add platforms for which there are files in `./bootstrap-files`.
1515+ # NOTE: Only add platforms for which there are files in `./bootstrap-files`
1616+ # or for which you plan to request the tarball upload soon. See the
1717+ # maintainers/scripts/bootstrap-files/README.md
1818+ # on how to request an upload.
1619 # Sort following the sorting in `./default.nix` `bootstrapFiles` argument.
17201821 armv5tel-unknown-linux-gnueabi = sheevaplug;