diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/0002-fix-django-version-bound.patch | 25 | ||||
| -rw-r--r-- | pkgs/glitchtip.nix | 6 | ||||
| -rw-r--r-- | pkgs/overlay.nix | 16 | ||||
| -rw-r--r-- | pkgs/travelynx.nix | 4 |
4 files changed, 42 insertions, 9 deletions
diff --git a/pkgs/0002-fix-django-version-bound.patch b/pkgs/0002-fix-django-version-bound.patch new file mode 100644 index 0000000..43d97a9 --- /dev/null +++ b/pkgs/0002-fix-django-version-bound.patch @@ -0,0 +1,25 @@ +From 59895529d6449b9a85d1be25d404b9f2a3ceee0e Mon Sep 17 00:00:00 2001 +From: stuebinm <stuebinm@disroot.org> +Date: Mon, 29 May 2023 00:24:56 +0200 +Subject: [PATCH] fix django version bonud + +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 1704691..a3e31af 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -7,7 +7,7 @@ license = "MIT" + + [tool.poetry.dependencies] + python = "^3.8" +-Django = "~4.1.0" ++Django = "~4.2.0" + djangorestframework = "^3.12.1" + django-allauth = "~0.52.0" + django-cors-headers = "^3.2.0" +-- +2.38.4 + diff --git a/pkgs/glitchtip.nix b/pkgs/glitchtip.nix index fa1a594..380eb48 100644 --- a/pkgs/glitchtip.nix +++ b/pkgs/glitchtip.nix @@ -17,7 +17,10 @@ let inherit python; projectDir = src; - patches = [ ./0001-fix-poetry-name-issue.patch ]; + patches = [ + ./0001-fix-poetry-name-issue.patch + ./0002-fix-django-version-bound.patch + ]; # a bunch of python packages seem to misdeclare their dependencies # a few are also just broken when building with Nix, so use these @@ -66,6 +69,7 @@ let buildInputs = [ unzip ]; propagatedBuildInputs = [ pythonApp.dependencyEnv ]; + buildPhase = '' unzip ${frontend} -d unpacked mv unpacked/dist/glitchtip-frontend dist diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 4ce3d37..665f7f6 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -3,6 +3,7 @@ self: super: let unstable = inputs.nixpkgs-unstable.legacyPackages.${self.system}; # { inherit (self) system; }; + crs-tools = self.callPackage ./crs-tools.nix {}; in { galmon-core = self.callPackage (import ./galmon.nix {}) {}; @@ -65,7 +66,7 @@ in emacs29 = self.callPackage (import "${inputs.nixpkgs.outPath}/pkgs/applications/editors/emacs/generic.nix" { version = "29"; - sha256 = "sha256-eYROQSXqBV4ULUZOVe1C9G/5LLp7u8qTvqAf0cz62Dg="; + sha256 = "sha256-52ww8DBlDu1frfmLMTnsCmQld6OVX7qBNqVXjuY3GA8="; }) { inherit (self.darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO; @@ -78,18 +79,21 @@ in withX = false; }; - crs-tools = self.callPackage ./crs-tools.nix {}; + crs-tracker = crs-tools.tracker; + crs-php = crs-tools.php; travelynx = self.callPackage ./travelynx.nix {}; - gleam = unstable.gleam; beamPackages = super.beam.packagesWith super.erlang_nox; - elixir = super.elixir_1_14; + elixir = self.beamPackages.elixir_1_14; + erlang = super.erlang_nox; - bahnhof-name = self.buildGleamApplication - { + bahnhof-name = let + inherit (self.callPackage "${inputs.nix-gleam.outPath}/builder/default.nix" {}) buildGleamApplication; + in buildGleamApplication { version = "0.1"; pname = "bahnhof.name"; src = inputs.bahnhof-name; }; + } diff --git a/pkgs/travelynx.nix b/pkgs/travelynx.nix index 4cbb6d0..1eabcae 100644 --- a/pkgs/travelynx.nix +++ b/pkgs/travelynx.nix @@ -212,9 +212,9 @@ let version = "2.0.2"; src = fetchgit { url = "https://git.finalrewind.org/travelynx"; - sha256 = "sha256-wUaQ+1+aqoF0mire8izWNKtlbRIEtrWEc7eACGNjGIY="; + sha256 = "sha256-J5csb1TrDMvtKClhpDC48C+Rqr4b1we+7jCjNifq1yg="; }; - buildInputs = [ p ]; + # buildInputs = [ p ]; buildPhase = '' substituteInPlace index.pl \ --replace "/usr/bin/env perl" ${perlWithPackages.outPath}/bin/perl |