diff options
Diffstat (limited to '')
| -rw-r--r-- | pkgs/overlay.nix | 101 |
1 files changed, 77 insertions, 24 deletions
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 3a37b8f..687d5cf 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, ... }: @@ -21,7 +21,7 @@ in src = fetchgit { url = "https://stuebinm.eu/git/git-annex-remote-remarkable2"; rev = "refs/heads/main"; - hash = "sha256-ZDoZFFADti3ZwLZqeP/F3BbW+Csuprw6+1LBBQIjnlo="; + hash = "sha256-Lgo+9FxJQ/ozBf79llYBu10JYMDvXn2vYkHbOZjRu/Y="; }; cargoLock.lockFile = "${src.outPath}/Cargo.lock"; }) { }; @@ -31,13 +31,16 @@ 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 = super.akkoma.overrideAttrs (old: { + akkoma = (self.callPackage ./akkoma {}).overrideAttrs { patches = [ ./patches/akkoma-toki-pona.patch ]; - }); + }; cgit = super.cgit.overrideAttrs (old: { patches = [ ./patches/cgit-main-instead-of-master.patch ]; @@ -50,6 +53,39 @@ 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"; @@ -148,10 +184,10 @@ in }; in '' ln -sf ${TwemojiMozilla-colr} \ - node_modules/matrix-react-sdk/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 + res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 ln -sf ${TwemojiMozilla-sbix} \ - node_modules/matrix-react-sdk/res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2 - substituteInPlace node_modules/matrix-react-sdk/src/stores/room-list/ListLayout.ts \ + res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2 + substituteInPlace src/stores/room-list/ListLayout.ts \ --replace "TILE_HEIGHT_PX = 44" "TILE_HEIGHT_PX = 32" ''; }; @@ -169,7 +205,7 @@ in , 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; @@ -179,6 +215,7 @@ in http-client-openssl http-types stm text time vector wai wai-extra warp ]; + jailbreak = true; mainProgram = "bahnhof-name"; license = lib.licenses.eupl12; postInstall = '' @@ -210,18 +247,33 @@ in }; }); + git-who = self.buildGoModule rec { + pname = "git-who"; + version = "1.1"; + + src = (self.fetchFromGitHub { + owner = "sinclairtarget"; + repo = "git-who"; + rev = "v${version}"; + hash = "sha256-H6RbmkM8/n0HDMI3auz6YyEn/vsfXWk5ig+pBhZG3nI="; + # submodules contain test data and have ssh urls, hence this absurdity + fetchSubmodules = true; + leaveDotGit = true; + }).overrideAttrs { + GIT_CONFIG_COUNT = 1; + GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf"; + GIT_CONFIG_VALUE_0 = "git@github.com:"; + }; + + vendorHash = "sha256-e2P7szjtAn4EFTy+eGi/9cYf/Raw/7O+PbYEOD8i3Hs="; + + nativeCheckInputs = [ self.gitMinimal ]; + }; + + hikari = self.callPackage ./hikari.nix { wlroots = self.wlroots_0_15; }; - wlroots_0_15 = (self.wlroots_0_16.overrideAttrs rec { - version = "0.15.1"; - src = self.fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "wlroots"; - repo = "wlroots"; - rev = version; - hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM="; - }; - }); + wlroots_0_15 = self.callPackage ./wlroots_0_15.nix {}; travelynx = self.callPackage ./travelynx.nix {}; @@ -229,13 +281,14 @@ in #### packaged mostly as shitpost / to play around with #### - bookwyrm = (self.callPackage ./bookwyrm.nix { - python = super.python311.override ({ + bookwyrm = self.callPackage ./bookwyrm {}; + bookwyrm-unwrapped = (self.callPackage ./bookwyrm/unwrapped.nix { + python = super.python312.override ({ packageOverrides = self: super: { - django = super.django_3; - python-crontab = super.python-crontab.overridePythonAttrs (_: { doCheck = false; }); 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 {}; + s3-tar = self.callPackage ./python/s3-tar.nix {}; bw-file-resubmit = self.callPackage ./python/bw-file-resubmit.nix {}; }; }); |