summaryrefslogtreecommitdiff
path: root/pkgs
diff options
context:
space:
mode:
authorstuebinm2023-07-01 00:27:25 +0200
committerstuebinm2023-07-01 00:27:25 +0200
commit7ee16b632dcd6ce0e0a3341886eabc2f3abe226c (patch)
tree0250479b81ee9504b5e215acdfbe345e75f8a536 /pkgs
parent34d980586399831d300d3aad031c555966f486af (diff)
update pkgs (travelynx, glitchtip)
Diffstat (limited to '')
-rw-r--r--pkgs/glitchtip-fix-versions.patch25
-rw-r--r--pkgs/glitchtip.nix9
-rw-r--r--pkgs/travelynx.nix7
3 files changed, 8 insertions, 33 deletions
diff --git a/pkgs/glitchtip-fix-versions.patch b/pkgs/glitchtip-fix-versions.patch
deleted file mode 100644
index 43d97a9..0000000
--- a/pkgs/glitchtip-fix-versions.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 94550ad..dcecd0e 100644
--- a/pkgs/glitchtip.nix
+++ b/pkgs/glitchtip.nix
@@ -1,17 +1,17 @@
{ stdenv, lib, poetry2nix, python, fetchFromGitLab, fetchurl, unzip }:
let
- version = "3.0.7";
+ version = "3.2.1";
src = fetchFromGitLab {
owner = "glitchtip";
repo = "glitchtip-backend";
- sha256 = "sha256-Dcdvv9DkU9znlamcSkGB/her+Ib6kV4mTkei6zoeZfE=";
+ sha256 = "sha256-rHognEPtj5yT0+EAU/p4LNfpf+/+WMhJyMQXv2GOGSU=";
rev = "v${version}";
};
frontend = fetchurl {
url =
"https://gitlab.com/api/v4/projects/15449363/jobs/artifacts/v${version}/download?job=build-assets";
- sha256 = "sha256-dv5/ilzcdmA8Ljee7u//my+yf5zPGevFNY8ig5YgWl0=";
+ sha256 = "sha256-9UbG25JReWY1h4fzdQyKm9nAKV392cXNVx5/mtyldX8=";
};
pythonApp = poetry2nix.mkPoetryApplication rec {
inherit python;
@@ -19,7 +19,6 @@ let
patches = [
./glitchtip-fix-poetry-name.patch
- ./glitchtip-fix-versions.patch
];
# a bunch of python packages seem to misdeclare their dependencies
@@ -54,7 +53,7 @@ let
});
inherit (python.pkgs)
django-stubs-ext django-stubs django async-timeout mypy-extensions tomli
- asgiref sqlparse typing-extensions pytz mypy;
+ asgiref sqlparse typing-extensions pytz mypy psycopg;
});
# magically makes the cargo errors go away
diff --git a/pkgs/travelynx.nix b/pkgs/travelynx.nix
index 1eabcae..c04b02c 100644
--- a/pkgs/travelynx.nix
+++ b/pkgs/travelynx.nix
@@ -204,6 +204,7 @@ let
DBFile
FileSlurp
TextLevenshteinXS
+ TextMarkdown
]);
# Note: set location of config via $MOJO_CONFIG when running index.pl
@@ -211,10 +212,10 @@ let
pname = "travelynx";
version = "2.0.2";
src = fetchgit {
- url = "https://git.finalrewind.org/travelynx";
- sha256 = "sha256-J5csb1TrDMvtKClhpDC48C+Rqr4b1we+7jCjNifq1yg=";
+ url = "https://github.com/derf/travelynx";
+ rev = "1.32.8";
+ sha256 = "sha256-Eg2+U2GMFunB3kO0YChF+2TiwwJTrX/0CqFYSRjLG7E=";
};
- # buildInputs = [ p ];
buildPhase = ''
substituteInPlace index.pl \
--replace "/usr/bin/env perl" ${perlWithPackages.outPath}/bin/perl