diff options
Diffstat (limited to 'pkgs/overlay.nix')
| -rw-r--r-- | pkgs/overlay.nix | 103 |
1 files changed, 61 insertions, 42 deletions
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 2d561ff..e02fdef 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -12,7 +12,7 @@ let radicle = import ./radicle.nix; in { - beam = super.beam_nox; + beam = super.beam_minimal; git-annex-remote-remarkable2 = self.callPackage ({ rustPlatform, fetchgit, ... }: @@ -31,8 +31,11 @@ in galmon-core = self.callPackage ./galmon.nix {}; galmon-full = self.callPackage ./galmon.nix { buildAll = true; }; - akkoma-fe = super.akkoma-frontends.akkoma-fe.overrideAttrs (old: { - patches = [ ./patches/akkoma-fe-toki-pona.patch ]; + akkoma-fe = super.akkoma-fe.overrideAttrs (old: { + patches = [ + ./patches/akkoma-fe-toki-pona.patch + ./patches/akkoma-fe-toki-pona-2.patch + ]; }); akkoma = (self.callPackage ./akkoma {}).overrideAttrs { @@ -50,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"; @@ -195,23 +165,70 @@ in overrides = self': super': with self.haskell.lib; { fuzzyfind = unmarkBroken (doJailbreak super'.fuzzyfind); fuzzyset = unmarkBroken (doJailbreak super'.fuzzyset); + rustls = self.haskellPackages.callPackage + ({ mkDerivation, async, base, bytestring, containers + , derive-storable, directory, filepath, hedgehog, lib, mtl, network + , process, resourcet, stm, tasty, tasty-hedgehog + , tasty-hunit, temporary, text, transformers + }: + mkDerivation { + pname = "rustls"; + version = "0.2.2.0"; + sha256 = "3c610437b4fb8b6ae86e6d3bebca8c15631b0d793d925ab5eeebb88b8ac77371"; + libraryHaskellDepends = [ + base bytestring containers derive-storable mtl network resourcet + text transformers + ]; + libraryPkgconfigDepends = [ self.rustls-ffi ]; + testHaskellDepends = [ + async base bytestring containers directory filepath hedgehog + process resourcet stm tasty tasty-hedgehog tasty-hunit temporary + text transformers + ]; + homepage = "https://github.com/amesgen/hs-rustls/tree/main/rustls"; + description = "TLS bindings for Rustls"; + license = lib.licenses.cc0; + doCheck = false; + }) {}; + http-client-rustls = self'.callPackage + ({ mkDerivation, base, bytestring, directory, filepath, http-client + , http-types, lib, network, port-utils, process, resourcet, rustls + , tasty, tasty-hunit, temporary, text + }: + mkDerivation { + pname = "http-client-rustls"; + version = "0.0.2.0"; + sha256 = "05505bf77e3d967b01187ffb55ea6c3f658ba446aeffeccdac16cbb6960d940d"; + libraryHaskellDepends = [ + base bytestring http-client network resourcet rustls text + ]; + testHaskellDepends = [ + base bytestring directory filepath http-client http-types network + port-utils process rustls tasty tasty-hunit temporary + ]; + homepage = "https://github.com/amesgen/hs-rustls/tree/main/http-client-rustls"; + description = "http-client TLS backend using Rustls"; + license = lib.licenses.cc0; + doCheck = false; + }) {}; }; }); pkg = { mkDerivation, base, bytestring, cassava, containers - , fuzzyfind, fuzzyset, http-client, http-client-openssl, http-types + , fuzzyfind, fuzzyset, http-client, http-client-rustls, http-types , lib, stm, text, time, vector, wai, wai-extra, warp }: mkDerivation { - pname = "bahnhof.name"; + pname = "bahnhof-name"; version = "0.2.0.0"; src = inputs.bahnhof-name; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring cassava containers fuzzyfind fuzzyset http-client - http-client-openssl http-types stm text time vector wai wai-extra + http-client-rustls http-types stm text time vector wai wai-extra warp ]; + jailbreak = true; mainProgram = "bahnhof-name"; license = lib.licenses.eupl12; postInstall = '' @@ -245,13 +262,13 @@ in git-who = self.buildGoModule rec { pname = "git-who"; - version = "0.7"; + version = "1.1"; src = (self.fetchFromGitHub { owner = "sinclairtarget"; repo = "git-who"; rev = "v${version}"; - hash = "sha256-Ujtwb4DTK7dUcyHvaF52a/YF3YO6WyszUIoxrEKE9jo="; + hash = "sha256-W3PDD0Gp9KStfa3+Wf2n8oxC5sp+YI/G5I3ukTg7H6k="; # submodules contain test data and have ssh urls, hence this absurdity fetchSubmodules = true; leaveDotGit = true; @@ -277,9 +294,11 @@ in #### packaged mostly as shitpost / to play around with #### - bookwyrm = (self.callPackage ./bookwyrm.nix { + bookwyrm = self.callPackage ./bookwyrm {}; + 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 {}; |