summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstuebinm2023-10-14 18:35:24 +0200
committerstuebinm2023-10-14 18:35:24 +0200
commit24d7c93723e98c117775874e7e3c213969634a22 (patch)
tree5a5fcd9440ad81fa4b06630353604ec3d8e8a649
parentd4bd55db8fa213c5a455c78f92fb24c8bfea44d3 (diff)
some reorganising of //pkgs
-rw-r--r--pkgs/galmon.nix3
-rw-r--r--pkgs/overlay.nix52
-rw-r--r--pkgs/travelynx.nix6
3 files changed, 34 insertions, 27 deletions
diff --git a/pkgs/galmon.nix b/pkgs/galmon.nix
index 0316482..87e77fd 100644
--- a/pkgs/galmon.nix
+++ b/pkgs/galmon.nix
@@ -1,5 +1,3 @@
-{ buildAll ? false }:
-
{ protobuf
, pkg-config
, h2o
@@ -13,6 +11,7 @@
, stdenv
, fetchFromGitHub
, lib
+, buildAll ? false
}:
let
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index cf1f7e5..7c75d69 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -11,16 +11,17 @@ let
radicle = import ./radicle.nix;
in
{
- galmon-core = self.callPackage (import ./galmon.nix {}) {};
- galmon-full = self.callPackage (import ./galmon.nix { buildAll = true; }) {};
+ beamPackages = super.beam.packagesWith self.erlang;
+ elixir = self.beamPackages.elixir_1_14;
+ erlang = super.erlang_nox;
+
+ inherit (unstable) lean4;
- glitchtip = (self.callPackage ./glitchtip.nix {
- python = super.python310.override ({
- packageOverrides = self: super: {
- django = super.django_4;
- };
- });
- });
+
+ #### packages which are actually in use somewhere ####
+
+ galmon-core = self.callPackage ./galmon.nix {};
+ galmon-full = self.callPackage ./galmon.nix { buildAll = true; };
almanac = self.rustPlatform.buildRustPackage rec {
pname = "almanac";
@@ -78,15 +79,6 @@ in
isabelle-rust-utils = self.isabelle-utils;
};
- crs-tracker = crs-tools.tracker;
- crs-php = crs-tools.php;
-
- travelynx = self.callPackage ./travelynx.nix {};
-
- beamPackages = super.beam.packagesWith self.erlang;
- elixir = self.beamPackages.elixir_1_14;
- erlang = super.erlang_nox;
-
bahnhof-name = let
inherit (self.callPackage "${inputs.nix-gleam.outPath}/builder/default.nix" {}) buildGleamApplication;
in buildGleamApplication {
@@ -99,9 +91,8 @@ in
'';
};
- matrix-to = self.callPackage ./matrix-to.nix {};
- inherit (unstable) lean4;
+ #### sporadically maintained / updated ####
hikari_unstable = (unstable.hikari.overrideAttrs (old: {
src = /home/stuebinm/clones/hikari;
@@ -111,9 +102,26 @@ in
"WITH_GAMMACONTROL=YES" "WITH_LAYERSHELL=YES" "WITH_SCREENCOPY=YES" ];
})).override { wlroots = unstable.wlroots_0_16; stdenv = self.clangStdenv; };
- heartwood = self.callPackage radicle.heartwood { inherit (rustPlatform) buildRustPackage; };
+ travelynx = self.callPackage ./travelynx.nix {};
- radicle-interface = self.callPackage radicle.interface {};
+
+ #### packaged mostly as shitpost / to play around with ####
+
+ glitchtip = (self.callPackage ./glitchtip.nix {
+ python = super.python310.override ({
+ packageOverrides = self: super: {
+ django = super.django_4;
+ };
+ });
+ });
+
+ crs-tracker = crs-tools.tracker;
+ crs-php = crs-tools.php;
+
+ matrix-to = self.callPackage ./matrix-to.nix {};
+
+ heartwood = self.callPackage radicle.heartwood { inherit (rustPlatform) buildRustPackage; };
+ radicle-interface = self.callPackage radicle.interface {};
radicle-tui = self.callPackage radicle.tui { inherit (rustPlatform) buildRustPackage; };
}
diff --git a/pkgs/travelynx.nix b/pkgs/travelynx.nix
index c04b02c..16dc473 100644
--- a/pkgs/travelynx.nix
+++ b/pkgs/travelynx.nix
@@ -210,11 +210,11 @@ let
# Note: set location of config via $MOJO_CONFIG when running index.pl
travelynx = stdenvNoCC.mkDerivation {
pname = "travelynx";
- version = "2.0.2";
+ version = "2.4.1";
src = fetchgit {
url = "https://github.com/derf/travelynx";
- rev = "1.32.8";
- sha256 = "sha256-Eg2+U2GMFunB3kO0YChF+2TiwwJTrX/0CqFYSRjLG7E=";
+ rev = "2.4.1";
+ sha256 = "sha256-sLrA61XYBfZFTSmveRLNCHyXKLv1IpzGy5imKrc5rVw=";
};
buildPhase = ''
substituteInPlace index.pl \