diff options
| -rw-r--r-- | chaski/services/bahnhof-name.nix | 7 | ||||
| -rw-r--r-- | flora/configuration.nix | 2 | ||||
| -rw-r--r-- | flora/services/blog.nix | 9 | ||||
| -rw-r--r-- | home/home.nix | 1 | ||||
| -rw-r--r-- | home/newsboat-public.nix | 5 | ||||
| -rw-r--r-- | home/packages.nix | 1 | ||||
| -rw-r--r-- | inputs.nix | 25 | ||||
| -rw-r--r-- | npins/default.nix | 6 | ||||
| -rw-r--r-- | npins/sources.json | 162 | ||||
| -rw-r--r-- | pkgs/bookwyrm/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/bookwyrm/unwrapped.nix | 7 | ||||
| -rw-r--r-- | pkgs/overlay.nix | 36 |
12 files changed, 189 insertions, 73 deletions
diff --git a/chaski/services/bahnhof-name.nix b/chaski/services/bahnhof-name.nix index 7360372..69d54cc 100644 --- a/chaski/services/bahnhof-name.nix +++ b/chaski/services/bahnhof-name.nix @@ -19,8 +19,13 @@ enableACME = true; forceSSL = true; locations."/".proxyPass = "http://localhost:8080"; + extraConfig = '' + proxy_set_header X-Forwarded-Host $host; + ''; }; in builtins.listToAttrs (map (name: { inherit name; value = vhost; }) ["bahnhof.name" "ril100.bahnhof.name" - "ds100.bahnhof.name" "leitpunkt.bahnhof.name"]); + "ds100.bahnhof.name" "leitpunkt.bahnhof.name" + "rnv.bahnhof.name" + ]); } diff --git a/flora/configuration.nix b/flora/configuration.nix index 40cd3a5..11d5a31 100644 --- a/flora/configuration.nix +++ b/flora/configuration.nix @@ -11,7 +11,7 @@ ./services/trainspotter.nix ./services/element.nix ./services/ntfy.nix - ./services/murmur.nix + # ./services/murmur.nix ./services/monit.nix ]; diff --git a/flora/services/blog.nix b/flora/services/blog.nix index e8335b1..e77cc7c 100644 --- a/flora/services/blog.nix +++ b/flora/services/blog.nix @@ -39,7 +39,14 @@ in services.nginx.virtualHosts."stuebinm.eu" = { enableACME = true; forceSSL = true; - locations."/".root = import inputs.blog { inherit pkgs; }; + locations."/".root = (import inputs.blog { inherit pkgs; }).overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ pkgs.exiftool pkgs.libxml2 ]; + + doCheck = true; + checkPhase = '' + xmllint _site/rss.xml + ''; + }); locations."/bookshelf/".alias = "${gtfsBooks.outPath}/"; }; } diff --git a/home/home.nix b/home/home.nix index e743f2a..2157528 100644 --- a/home/home.nix +++ b/home/home.nix @@ -297,6 +297,7 @@ macro 5 ${mkMpv "five"} macro f set browser "${pkgs.xdg-utils}/bin/xdg-open %u >/dev/null 2>&1 &" ; open-in-browser ; set browser "${config.programs.newsboat.browser} %u" macro d set browser "kitty @launch --type tab fish -c 'fetchpdf %u'" ; open-in-browser ; set browser "${config.programs.newsboat.browser} %u" + macro V set browser "firefox --private-window %u >/dev/null 2>&1 &" ; open-in-browser ; set browser "${config.programs.newsboat.browser} %u" bind-key j down bind-key k up diff --git a/home/newsboat-public.nix b/home/newsboat-public.nix index 29e2370..bd334fb 100644 --- a/home/newsboat-public.nix +++ b/home/newsboat-public.nix @@ -219,6 +219,11 @@ with import ./newsboat-lib.nix; (btag "https://antonia.is/rss.xml" "friends") (btag "https://ancientalexandra.weebly.com/3/feed" "hist") (btag "https://github.com/bookwyrm-social/bookwyrm/releases.atom" "comp") + (btag "https://rachelbythebay.com/w/atom.xml" "comp") + (btag "https://xn--gckvb8fzb.com/index.xml" "comp") + (btag "https://blog.aada.cat/index.xml" "friends") + (btag "https://jonworth.eu/feed/" "trains") + (btag "https://vulpinecitrus.info/blog/atom.xml" "comp") # paper (btag "http://arxiv.org/rss/cs.PL" "paper") diff --git a/home/packages.nix b/home/packages.nix index 415d963..2bdee84 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -30,6 +30,7 @@ in wineWowPackages.full sops xdg-utils exiftool mercurial darcs git-annex-remote-remarkable2 git-who rlwrap + inputs.ocaml-forester.legacyPackages.${system}.forester # graphical utils kitty # gnss things @@ -65,5 +65,30 @@ let lix-overlay = import "${sources.lix-nixos-module}/overlay.nix" { lix = sources.lix // { rev = sources.lix.revision; }; }; + + + ###### Forester stuff + + flake-compat = import sources.flake-compat; + + # currently unused + opam2json = callFlake "opam2json" { + nixpkgs = nixpkgs-flake; + }; + # opam-nix does not want to be called like this; i do not know why + # opam-nix = callFlake "opam-nix"{ + # inherit (sources) opam-repository opam-overlays mirage-opam-overlays; + # inherit (inputs) flake-utils opam2json flake-compat; + # nixpkgs = nixpkgs-unstable-flake; + # }; + # so i gave up an use the flake-compat'd version instead, which uses an + # old nixpkgs pin i cannot easily change ... + opam-nix = (flake-compat { src = sources.opam-nix.outPath; }).defaultNix; + + ocaml-forester = callFlake "ocaml-forester" { + nixpkgs = nixpkgs-flake; + inherit (inputs) opam-nix flake-utils; + inherit (sources) opam-repository; + }; }; in inputs diff --git a/npins/default.nix b/npins/default.nix index 6592476..8955703 100644 --- a/npins/default.nix +++ b/npins/default.nix @@ -107,12 +107,14 @@ let "${if matched == null then "source" else builtins.head matched}${appendShort}"; name = urlToName url revision; in - builtins.fetchGit { + builtins.fetchGit ({ rev = revision; inherit name; # hash = hash; inherit url submodules; - }; + } // (if branch != null then { + ref = "refs/heads/${branch}"; + } else {})); mkPyPiSource = { url, hash, ... }: diff --git a/npins/sources.json b/npins/sources.json index 9ed6583..94f72f0 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -9,9 +9,9 @@ }, "branch": "main", "submodules": false, - "revision": "5326c202b57d87a9921810ef26fca98edce77d5f", - "url": "https://github.com/ai-robots-txt/ai.robots.txt/archive/5326c202b57d87a9921810ef26fca98edce77d5f.tar.gz", - "hash": "0l45kdf9yv32wx15sa949dvlgs52lyx1z5j46yx7pj1aslcc5dgh" + "revision": "8b8bf9da5d11095dcb5dafe07e757ff5c4439b94", + "url": "https://github.com/ai-robots-txt/ai.robots.txt/archive/8b8bf9da5d11095dcb5dafe07e757ff5c4439b94.tar.gz", + "hash": "1aiq7b1njziwfrnp1h0n62mqgsfggqf55grkp5mblgg78xgzxrxb" }, "almanac": { "type": "Git", @@ -31,11 +31,11 @@ "type": "Git", "url": "https://stuebinm.eu/git/bahnhof.name" }, - "branch": "main", + "branch": "rnv", "submodules": false, - "revision": "2dd565d546ef7cba05846e90d79ae4a15a193f41", + "revision": "38ea5267c448f7c3d228477479a2dd66e57d4688", "url": null, - "hash": "137wq0hj9j4wikq401mz577a7r5cmfzfxyf4wv1ncxy450l4lrsh" + "hash": "0bl87zbh4jpw25h7bk6mkh0789ppbpa13zqxlm59r4wfp1nz8yii" }, "blog": { "type": "Git", @@ -45,9 +45,9 @@ }, "branch": "main", "submodules": false, - "revision": "99f88a9b675838f08e711a73a1bd5b6c80d66d31", + "revision": "61d865b1cb837f059bcd0b215d6f83ae33393e32", "url": null, - "hash": "1dnkz5vsbn8f924crhqp97xfkamypai1mqmbj867kwv0bvs036gb" + "hash": "0076rfb3fzb8j9mbi0xlv1fx8l0v9rvba6gfn6xydds75ahmf0bj" }, "deploy-rs": { "type": "Git", @@ -61,6 +61,22 @@ "url": null, "hash": "1iiplqa731ldha728xk2fi36n87p20hnzf35g21jli1dlknw388f" }, + "flake-compat": { + "type": "GitRelease", + "repository": { + "type": "GitHub", + "owner": "edolstra", + "repo": "flake-compat" + }, + "pre_releases": false, + "version_upper_bound": null, + "release_prefix": null, + "submodules": false, + "version": "v1.1.0", + "revision": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "url": "https://api.github.com/repos/edolstra/flake-compat/tarball/v1.1.0", + "hash": "19d2z6xsvpxm184m41qrpi1bplilwipgnzv9jy17fgw421785q1m" + }, "flake-utils": { "type": "GitRelease", "repository": { @@ -98,9 +114,9 @@ }, "branch": "release-25.05", "submodules": false, - "revision": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", - "url": "https://github.com/nix-community/home-manager/archive/7aae0ee71a17b19708b93b3ed448a1a0952bf111.tar.gz", - "hash": "12246mk1xf1bmak1n36yfnr4b0vpcwlp6q66dgvz8ip8p27pfcw2" + "revision": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", + "url": "https://github.com/nix-community/home-manager/archive/44831a7eaba4360fb81f2acc5ea6de5fde90aaa3.tar.gz", + "hash": "07pk5m6mxi666dclaxdwf7xrinifv01vvgxn49bjr8rsbh31syaq" }, "isabelle-utils": { "type": "Git", @@ -122,9 +138,9 @@ }, "branch": "main", "submodules": false, - "revision": "7453e2979f1d4684bea4cb340f23c089ea0d5a90", + "revision": "a99842e0af7cb8a1b6adb2cddbbe6a63b1e9ee4d", "url": null, - "hash": "0nk71jp55lw73rp9y5bp85818w92c5bv9gxz4sn3cbrim89syipb" + "hash": "0vsgz2r95f4whvrmghgqsg2xy1mc4mj6jwd2zrlyr9iivcwi1pw1" }, "lix-nixos-module": { "type": "Git", @@ -134,9 +150,22 @@ }, "branch": "main", "submodules": false, - "revision": "3c23c6ae2aecc1f76ae7993efe1a78b5316f0700", + "revision": "6c95c0b6f73f831226453fc6905c216ab634c30f", "url": null, - "hash": "1yv1d45jgfzjxcg23m2qwis5rxx2v45vfid8b0lm1sl6p66h4hpc" + "hash": "0lgfg939gfn4yifyib7f88gvcl4y8p7jjvq5k6ia8q68lw240wsy" + }, + "mirage-opam-overlays": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "dune-universe", + "repo": "mirage-opam-overlays" + }, + "branch": "main", + "submodules": false, + "revision": "eddcd1bc7e035392596b603d23dde67a88e6f6bc", + "url": "https://github.com/dune-universe/mirage-opam-overlays/archive/eddcd1bc7e035392596b603d23dde67a88e6f6bc.tar.gz", + "hash": "09cwhnnmphicm4j6figds2ckagbnypdmcqmbgcszjn6zzll5fymx" }, "nixos-mailserver": { "type": "Git", @@ -147,9 +176,9 @@ }, "branch": "master", "submodules": false, - "revision": "7405122ddeefa690b9fa6f25a23195ba57f5f599", - "url": "https://gitlab.com/api/v4/projects/simple-nixos-mailserver%2Fnixos-mailserver/repository/archive.tar.gz?sha=7405122ddeefa690b9fa6f25a23195ba57f5f599", - "hash": "15p20caq81hnjy2qsk2xr4r7px3pndigzcrswzkag02rqq58065i" + "revision": "1ccd57f177539ed8c207b893c3f9798d88f87d2e", + "url": "https://gitlab.com/api/v4/projects/simple-nixos-mailserver%2Fnixos-mailserver/repository/archive.tar.gz?sha=1ccd57f177539ed8c207b893c3f9798d88f87d2e", + "hash": "1dvgzzzdl60k7cq067id01p40c3nqvfqw34m8gi7qhx3j6aw6knk" }, "nixpkgs": { "type": "Git", @@ -160,9 +189,9 @@ }, "branch": "nixos-25.05", "submodules": false, - "revision": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3", - "url": "https://github.com/NixOS/nixpkgs/archive/6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3.tar.gz", - "hash": "1i94mkhmmxl3cks99y6viqlmv4yvdnkdk0wnmavi8bj6axrrmxl7" + "revision": "00d2457e2f608b4be6fe8b470b0a36816324b0ae", + "url": "https://github.com/NixOS/nixpkgs/archive/00d2457e2f608b4be6fe8b470b0a36816324b0ae.tar.gz", + "hash": "10h8yz4x1iacrp1bsih2kmpn1chaxwpmqrpy1lysrb8p9hfwacp1" }, "nixpkgs-unstable": { "type": "Git", @@ -173,9 +202,9 @@ }, "branch": "nixpkgs-unstable", "submodules": false, - "revision": "41da1e3ea8e23e094e5e3eeb1e6b830468a7399e", - "url": "https://github.com/NixOS/nixpkgs/archive/41da1e3ea8e23e094e5e3eeb1e6b830468a7399e.tar.gz", - "hash": "0c30r57ycw3zvp99mq1cclnacxsqbj0667ww6nq14wf1zki077cf" + "revision": "a672be65651c80d3f592a89b3945466584a22069", + "url": "https://github.com/NixOS/nixpkgs/archive/a672be65651c80d3f592a89b3945466584a22069.tar.gz", + "hash": "1p2g7g9vlpv14xz6rrlb8i6w8sxki8i35m15phjiwfrqaf6x508i" }, "ntfy-matrix-bot": { "type": "Git", @@ -189,6 +218,79 @@ "url": null, "hash": "1kq34zk7k6rg9k8frvx51hl1ldqqbfgvhm9f827b5a4c0rx28dah" }, + "ocaml-forester": { + "type": "GitRelease", + "repository": { + "type": "Git", + "url": "https://git.sr.ht/~jonsterling/ocaml-forester" + }, + "pre_releases": false, + "version_upper_bound": null, + "release_prefix": null, + "submodules": false, + "version": "5.0", + "revision": "5ceee0e7d20febc0552caad0f71aa01750574d43", + "url": null, + "hash": "1ajajlg1yksk666mp5xf0ipy0c2r4pz650mrcprm45rf76xxjmj9" + }, + "opam-nix": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "tweag", + "repo": "opam-nix" + }, + "branch": "main", + "submodules": false, + "revision": "98ca8f4401e996aeac38b6f14bf3a82d85b7add7", + "url": "https://github.com/tweag/opam-nix/archive/98ca8f4401e996aeac38b6f14bf3a82d85b7add7.tar.gz", + "hash": "0iwxpacx7dzqyvnilsy54bzaf23f5yvmm155qkw3i6yxygav2xvm" + }, + "opam-overlays": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "dune-universe", + "repo": "opam-overlays" + }, + "branch": "master", + "submodules": false, + "revision": "d5c12f6d5c7909e6119a82bc4aba682ac3110b2d", + "url": "https://github.com/dune-universe/opam-overlays/archive/d5c12f6d5c7909e6119a82bc4aba682ac3110b2d.tar.gz", + "hash": "199qrblnd9mblr8l815wibmc147qinyvkqqi2gjmby76g3aw1h4x" + }, + "opam-repository": { + "type": "GitRelease", + "repository": { + "type": "GitHub", + "owner": "ocaml", + "repo": "opam-repository" + }, + "pre_releases": false, + "version_upper_bound": null, + "release_prefix": null, + "submodules": false, + "version": "1.2.0", + "revision": "62aabc825803c9dbf126488219524e68d74cd41c", + "url": "https://api.github.com/repos/ocaml/opam-repository/tarball/1.2.0", + "hash": "1rk665nzczykyxxs7c7kp2hgy49sn3alvcw15n7gsxm9qyxw0agz" + }, + "opam2json": { + "type": "GitRelease", + "repository": { + "type": "GitHub", + "owner": "tweag", + "repo": "opam2json" + }, + "pre_releases": false, + "version_upper_bound": null, + "release_prefix": null, + "submodules": false, + "version": "v0.4", + "revision": "562752a30aaff8985890ef5a2049a82247fc4b0f", + "url": "https://api.github.com/repos/tweag/opam2json/tarball/v0.4", + "hash": "00z4iqyl1x27nhkn89y771jl0iyqi2kfk8mq55nh0m798xnxz5g6" + }, "playground": { "type": "Git", "repository": { @@ -210,9 +312,9 @@ }, "branch": "master", "submodules": false, - "revision": "d72bd8c9fda03c9834ea89d7a5a21c7880b79277", - "url": "https://github.com/oxalica/rust-overlay/archive/d72bd8c9fda03c9834ea89d7a5a21c7880b79277.tar.gz", - "hash": "1z9kly96d8dbhf2h73vss6dkjy11aqdzi2rysiqz3hzxlhppvhgz" + "revision": "7ed7e8c74be95906275805db68201e74e9904f07", + "url": "https://github.com/oxalica/rust-overlay/archive/7ed7e8c74be95906275805db68201e74e9904f07.tar.gz", + "hash": "1iqg073ara6z5mzzwz12zb20swq8lbjkgy0k4bc170g6bh03vmjx" }, "showrt": { "type": "Git", @@ -248,9 +350,9 @@ }, "branch": "master", "submodules": false, - "revision": "50754dfaa0e24e313c626900d44ef431f3210138", - "url": "https://github.com/Mic92/sops-nix/archive/50754dfaa0e24e313c626900d44ef431f3210138.tar.gz", - "hash": "1q0b58m9bm4kkm19c0d8lbr10cg00ijqn63wqwxfc0s5yv6x1san" + "revision": "aeb517262102f13683d7a191c7e496b34df8d24c", + "url": "https://github.com/Mic92/sops-nix/archive/aeb517262102f13683d7a191c7e496b34df8d24c.tar.gz", + "hash": "1pra1yavc8xhgvl53jji8w3f9d8j5shgkfzwav69wyg429n8rlcb" }, "traveltext": { "type": "Git", diff --git a/pkgs/bookwyrm/default.nix b/pkgs/bookwyrm/default.nix index e4c55bf..6e0756b 100644 --- a/pkgs/bookwyrm/default.nix +++ b/pkgs/bookwyrm/default.nix @@ -12,7 +12,6 @@ let settingsWithDefaults = { DOMAIN = "localhost"; DEBUG = false; - USE_HTTPS = false; EMAIL = "your@email.here"; PGPORT = 5432; POSTGRES_USER = "bookwyrm"; diff --git a/pkgs/bookwyrm/unwrapped.nix b/pkgs/bookwyrm/unwrapped.nix index 151a9b5..dce4279 100644 --- a/pkgs/bookwyrm/unwrapped.nix +++ b/pkgs/bookwyrm/unwrapped.nix @@ -5,7 +5,7 @@ python.pkgs.buildPythonApplication rec { pname = "bookwyrm-unwrapped"; - version = "0.7.5"; + version = "0.8.0"; format = "other"; @@ -13,7 +13,7 @@ python.pkgs.buildPythonApplication rec { owner = "bookwyrm-social"; repo = "bookwyrm"; rev = "refs/tags/v${version}"; - hash = "sha256-/oak9dEB2rR2z8b9oXVQ6+F2H7s0F5hVxmAlPdpaA0w="; + hash = "sha256-juJLl6yN/u5Tx9j2rgT6d+92U4QAqhxG/LFZlIQtFxA="; }; propagatedBuildInputs = with python.pkgs; [ @@ -40,7 +40,7 @@ python.pkgs.buildPythonApplication rec { markdown packaging pillow - psycopg2 + psycopg pycryptodome dateutil redis @@ -60,6 +60,7 @@ python.pkgs.buildPythonApplication rec { pyotp qrcode grpcio + ua-parser ]; postInstall = '' diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 687d5cf..a3a58a7 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -53,39 +53,6 @@ in cargoLock.lockFile = "${src}/Cargo.lock"; }; - mergiraf = self.rustPlatform.buildRustPackage rec { - pname = "mergiraf"; - version = "git"; - src = self.fetchgit { - url = "https://codeberg.org/mergiraf/mergiraf"; - rev = "v0.2.0"; - hash = "sha256-egtX2daCbPXi5rX2OxbEZA/VI9R4HMj5LRKbUEBFo+E="; - }; - # TODO: probably unnecessary once we are on nixpkgs 24.11; earlier version - # hardcode --frozen here, but cargo wants --offline. - # the postBuild hook is necessary to set up things for the install hook - buildPhase = '' - cargo build -j $NIX_BUILD_CORES \ - --target x86_64-unknown-linux-gnu \ - --release \ - --offline - - runHook postBuild - ''; - # no idea why this didn't work with either test or build inputs .. - preCheck = '' - export PATH=$PATH:${self.gitMinimal}/bin - ''; - cargoLock = { - lockFile = "${src}/Cargo.lock"; - outputHashes = { - "tree-sitter-go-0.23.1" = "sha256-elPqkvVYs0vADOuN/umDteWP5hqcXhQAoSkqYDtTxaU="; - "tree-sitter-xml-0.7.0" = "sha256-RTWvOUAs3Uql9DKsP1jf9FZZHaZORE40GXd+6g6RQZw="; - "tree-sitter-yaml-0.6.1" = "sha256-gS+SjOnGl/86U9VV/y1ca7naYIe7DAOvOv++jCRLTKo="; - }; - }; - }; - rustex = rustPlatform.buildRustPackage rec { pname = "rustex"; version = "git"; @@ -255,7 +222,7 @@ in owner = "sinclairtarget"; repo = "git-who"; rev = "v${version}"; - hash = "sha256-H6RbmkM8/n0HDMI3auz6YyEn/vsfXWk5ig+pBhZG3nI="; + hash = "sha256-W3PDD0Gp9KStfa3+Wf2n8oxC5sp+YI/G5I3ukTg7H6k="; # submodules contain test data and have ssh urls, hence this absurdity fetchSubmodules = true; leaveDotGit = true; @@ -285,6 +252,7 @@ in bookwyrm-unwrapped = (self.callPackage ./bookwyrm/unwrapped.nix { python = super.python312.override ({ packageOverrides = self: super: { + django = self.django_5; django-sass-processor = self.callPackage ./python/django-sass-processor.nix {}; django-imagekit = self.callPackage ./python/django-imagekit.nix {}; django-pgtrigger = self.callPackage ./python/django-pgtrigger.nix {}; |
