Compare commits

..

No commits in common. "db82708a892c160cca9d215f8749a6878eafa9df" and "c4e6ce786faede67bcdf0ab5b224da89a6efc1d2" have entirely different histories.

6 changed files with 32 additions and 25 deletions

View file

@ -1,7 +1,7 @@
ANARCHIST LICENSE
Version 1.0, 1 May, 2021
Copyright © 2023 JFDI Collective
Copyright © 2021 JFDI Collective
This is Anarchist software, released for free use by individuals and
organizations that do not operate by capitalist principles.

View file

@ -6,7 +6,7 @@ cabal-version: >= 1.10
executable site
main-is: site.hs
build-depends: base == 4.*
, hakyll == 4.15.*
, hakyll == 4.14.*
, containers == 0.6.*
, filepath == 1.4.*
, pandoc

View file

@ -5,22 +5,22 @@
"homepage": "https://github.com/nmattia/niv",
"owner": "nmattia",
"repo": "niv",
"rev": "82e5cd1ad3c387863f0545d7591512e76ab0fc41",
"sha256": "090l219mzc0gi33i3psgph6s2pwsc8qy4lyrqjdj4qzkvmaj65a7",
"rev": "dd13098d01eaa6be68237e7e38f96782b0480755",
"sha256": "1cfjdbsn0219fjzam1k7nqzkz8fb1ypab50rhyj026qbklqq2kvq",
"type": "tarball",
"url": "https://github.com/nmattia/niv/archive/82e5cd1ad3c387863f0545d7591512e76ab0fc41.tar.gz",
"url": "https://github.com/nmattia/niv/archive/dd13098d01eaa6be68237e7e38f96782b0480755.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {
"branch": "nixos-23.05",
"branch": "nixos-21.05",
"description": "Nix Packages collection",
"homepage": "",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a16f7eb56e88c8985fcc6eb81dabd6cade4e425a",
"sha256": "0a0dnbsbblh4wps0lzzxv3gfphscv6bqjc77lkr58xkzcijjdlv2",
"rev": "9e86f5f7a19db6da2445f07bafa6694b556f9c6d",
"sha256": "0i2j7bf6jq3s13n12xahramami0n6zn1mksqgi01k7flpgyymcck",
"type": "tarball",
"url": "https://github.com/nixos/nixpkgs/archive/a16f7eb56e88c8985fcc6eb81dabd6cade4e425a.tar.gz",
"url": "https://github.com/nixos/nixpkgs/archive/9e86f5f7a19db6da2445f07bafa6694b556f9c6d.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}

View file

@ -1,5 +1,9 @@
let sources = import ./nix/sources.nix;
in { compiler ? "ghc902", pkgs ? import sources.nixpkgs { } }:
let
sources = import ./nix/sources.nix;
in
{ compiler ? "ghc8104"
, pkgs ? import sources.nixpkgs { }
}:
let
inherit (pkgs.lib.trivial) flip pipe;
@ -7,10 +11,12 @@ let
haskellPackages = pkgs.haskell.packages.${compiler}.override {
overrides = hpNew: hpOld: {
hakyll = pipe hpOld.hakyll [
(flip appendPatch ./hakyll.patch)
(flip appendConfigureFlags [ "-f" "watchServer" "-f" "previewServer" ])
];
hakyll =
pipe
hpOld.hakyll
[ (flip appendPatch ./hakyll.patch)
(flip appendConfigureFlags [ "-f" "watchServer" "-f" "previewServer" ])
];
jfdic-web = hpNew.callCabal2nix "jfdic-web" ./. { };
@ -19,17 +25,18 @@ let
};
project = haskellPackages.jfdic-web;
in {
in
{
project = project;
shell = haskellPackages.shellFor {
packages = p: with p; [ project ];
packages = p: with p; [
project
];
buildInputs = with haskellPackages; [
ghcid # GHCi based IDE
hlint # or ormolu
pkgs.niv
pkgs.tea # Gitea official CLI client
zlib
ghcid # GHCi based IDE
hlint # or ormolu
pkgs.niv # Nix dependency management
];
withHoogle = true;
};

View file

@ -134,12 +134,12 @@ siteCtx =
constField "site-url" "https://jfdic.org" `mappend`
constField "tagline" "liberation, autonomy, privacy" `mappend`
constField "site-title" "JFDI Collective" `mappend`
constField "copy-year" "2023" `mappend`
constField "copy-year" "2021" `mappend`
constField "github-repo" "https://source.jfdic.org/jfdic/jfdic-web" `mappend`
defaultContext
baseCtx =
constField "baseurl" "https://jfdic.org"
constField "baseurl" "http://jfdic.org"
--------------------------------------------------------------------------------

View file

@ -27,7 +27,7 @@
<label for="sidebar-checkbox" class="sidebar-toggle"></label>
<script src='$baseurl$/js/script.js'></script>
<script src='$baseurl$/public/js/script.js'></script>
</body>