diff options
Diffstat (limited to 'pkgs/overlay.nix')
| -rw-r--r-- | pkgs/overlay.nix | 39 |
1 files changed, 4 insertions, 35 deletions
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index e981f8f..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; @@ -281,9 +248,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 {}; |