diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/bookwyrm/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/bookwyrm/unwrapped.nix | 7 | ||||
| -rw-r--r-- | pkgs/overlay.nix | 86 |
3 files changed, 54 insertions, 40 deletions
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..e02fdef 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"; @@ -198,10 +165,56 @@ 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 { @@ -212,7 +225,7 @@ in 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; @@ -255,7 +268,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 +298,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 {}; |