update inputs

7 files changed, 3 insertions, 53 deletions

diff --git a/pkgs/0001-add-lockfile.patch b/pkgs/crs-tools-add-lockfile.patch
index a8cd3ce..a8cd3ce 100644
--- a/pkgs/0001-add-lockfile.patch
+++ b/pkgs/crs-tools-add-lockfile.patch
diff --git a/pkgs/crs-tools.nix b/pkgs/crs-tools.nix
index def657c..4993b53 100644
--- a/pkgs/crs-tools.nix
+++ b/pkgs/crs-tools.nix
@@ -27,7 +27,7 @@ rec {
     };
 
     patches = [
-      ./0001-add-lockfile.patch
+      ./crs-tools-add-lockfile.patch
     ];
 
     buildInputs = [ php php.packages.composer ];
diff --git a/pkgs/0001-fix-poetry-name-issue.patch b/pkgs/glitchtip-fix-poetry-name.patch
index 9cc82bd..9cc82bd 100644
--- a/pkgs/0001-fix-poetry-name-issue.patch
+++ b/pkgs/glitchtip-fix-poetry-name.patch
diff --git a/pkgs/0002-fix-django-version-bound.patch b/pkgs/glitchtip-fix-versions.patch
index 43d97a9..43d97a9 100644
--- a/pkgs/0002-fix-django-version-bound.patch
+++ b/pkgs/glitchtip-fix-versions.patch
diff --git a/pkgs/glitchtip.nix b/pkgs/glitchtip.nix
index 380eb48..94550ad 100644
--- a/pkgs/glitchtip.nix
+++ b/pkgs/glitchtip.nix
@@ -18,8 +18,8 @@ let
     projectDir = src;
 
     patches = [
-      ./0001-fix-poetry-name-issue.patch
-      ./0002-fix-django-version-bound.patch
+      ./glitchtip-fix-poetry-name.patch
+      ./glitchtip-fix-versions.patch
     ];
 
     # a bunch of python packages seem to misdeclare their dependencies
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 0f38c5f..b3876d5 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -18,11 +18,6 @@ in
     });
   });
 
-  typst = self.callPackage ./typst.nix {
-    rust-bin =
-      self.rust-bin;
-  };
-
   almanac = self.rustPlatform.buildRustPackage rec {
     pname = "almanac";
     version = "git";
@@ -64,22 +59,6 @@ in
     isabelle-rust-utils = self.isabelle-utils;
   };
 
-  emacs29 = self.callPackage
-    (import "${inputs.nixpkgs.outPath}/pkgs/applications/editors/emacs/generic.nix" {
-      version = "29";
-      sha256 = "sha256-52ww8DBlDu1frfmLMTnsCmQld6OVX7qBNqVXjuY3GA8=";
-    }) {
-      inherit (self.darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz
-        QuartzCore WebKit ImageCaptureCore GSS ImageIO;
-      gconf = null;
-      alsa-lib = null;
-      gpm = null;
-      libXaw = self.xorg.libXaw;
-      inherit (self.darwin) sigtool;
-      withPgtk = true;
-      withX = false;
-    };
-
   crs-tracker = crs-tools.tracker;
   crs-php = crs-tools.php;
 
@@ -97,7 +76,5 @@ in
     src = inputs.bahnhof-name;
   };
 
-
-  # dbus = super.dbus.override { x11Support = false; };
   mu = oldstable.mu;
 }
diff --git a/pkgs/typst.nix b/pkgs/typst.nix
deleted file mode 100644
index f505cf5..0000000
--- a/pkgs/typst.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ rustPlatform, fetchFromGitHub, lib, git, rust-bin, ... }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "typst-cli";
-  version = "v0.3.0";
-
-  cargoBuildFlags = "-p typst-cli";
-  cargoLock = {
-    lockFile = "${src}/Cargo.lock";
-    outputHashes = {
-      "iai-0.1.1" = "sha256-EdNzCPht5chg7uF9O8CtPWR/bzSYyfYIXNdLltqdlR0=";
-    };
-  };
-  src = fetchFromGitHub {
-    owner = "typst";
-    repo = "typst";
-    sha256 = "sha256-JCsHNPQ9WHqq1Qg2j3TjRr0RCnwS8X3/K/n8FXYE8D4=";
-    rev = version;
-    leaveDotGit = true;
-  };
-
-  # the build.rs script wants a version hash from git.
-  nativeBuildInputs = [
-    git
-    rust-bin.stable.latest.minimal
-  ];
-}