From 34d980586399831d300d3aad031c555966f486af Mon Sep 17 00:00:00 2001 From: stuebinm Date: Fri, 30 Jun 2023 23:39:18 +0200 Subject: update inputs --- pkgs/0001-add-lockfile.patch | 47 -------------------------------- pkgs/0001-fix-poetry-name-issue.patch | 23 ---------------- pkgs/0002-fix-django-version-bound.patch | 25 ----------------- pkgs/crs-tools-add-lockfile.patch | 47 ++++++++++++++++++++++++++++++++ pkgs/crs-tools.nix | 2 +- pkgs/glitchtip-fix-poetry-name.patch | 23 ++++++++++++++++ pkgs/glitchtip-fix-versions.patch | 25 +++++++++++++++++ pkgs/glitchtip.nix | 4 +-- pkgs/overlay.nix | 23 ---------------- pkgs/typst.nix | 27 ------------------ 10 files changed, 98 insertions(+), 148 deletions(-) delete mode 100644 pkgs/0001-add-lockfile.patch delete mode 100644 pkgs/0001-fix-poetry-name-issue.patch delete mode 100644 pkgs/0002-fix-django-version-bound.patch create mode 100644 pkgs/crs-tools-add-lockfile.patch create mode 100644 pkgs/glitchtip-fix-poetry-name.patch create mode 100644 pkgs/glitchtip-fix-versions.patch delete mode 100644 pkgs/typst.nix (limited to 'pkgs') diff --git a/pkgs/0001-add-lockfile.patch b/pkgs/0001-add-lockfile.patch deleted file mode 100644 index a8cd3ce..0000000 --- a/pkgs/0001-add-lockfile.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 339d2c0c3df062eee919691740e8d5b4d4b5bc30 Mon Sep 17 00:00:00 2001 -From: stuebinm -Date: Tue, 28 Mar 2023 01:54:24 +0200 -Subject: [PATCH] add lockfile - ---- - composer.lock | 28 ++++++++++++++++++++++++++++ - 1 file changed, 28 insertions(+) - create mode 100644 composer.lock - -diff --git a/composer.lock b/composer.lock -new file mode 100644 -index 00000000..d2b67b38 ---- /dev/null -+++ b/composer.lock -@@ -0,0 +1,28 @@ -+{ -+ "_readme": [ -+ "This file locks the dependencies of your project to a known state", -+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", -+ "This file is @generated automatically" -+ ], -+ "content-hash": "b3c1951928eb81c8bcfcace0c956b376", -+ "packages": [], -+ "packages-dev": [], -+ "aliases": [], -+ "minimum-stability": "stable", -+ "stability-flags": [], -+ "prefer-stable": false, -+ "prefer-lowest": false, -+ "platform": { -+ "php": ">=7.1.0", -+ "ext-apcu": "*", -+ "ext-curl": "*", -+ "ext-intl": "*", -+ "ext-mbstring": "*", -+ "ext-openssl": "*", -+ "ext-xdiff": "*", -+ "ext-xmlrpc": "*", -+ "ext-xsl": "*" -+ }, -+ "platform-dev": [], -+ "plugin-api-version": "2.3.0" -+} --- -2.38.4 - diff --git a/pkgs/0001-fix-poetry-name-issue.patch b/pkgs/0001-fix-poetry-name-issue.patch deleted file mode 100644 index 9cc82bd..0000000 --- a/pkgs/0001-fix-poetry-name-issue.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 6a38df44cc64a4952528afe71c03c3931526af15 Mon Sep 17 00:00:00 2001 -From: stuebinm -Date: Wed, 22 Mar 2023 00:36:23 +0100 -Subject: [PATCH] fix poetry name issue - ---- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index 9eb393a..1704691 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,5 +1,5 @@ - [tool.poetry] --name = "glitchtip-backend" -+name = "glitchtip" - version = "0.1.0" - description = "Django backend that powers GlitchTip, an open source reimplementation of Sentry" - authors = ["David Burke"] --- -2.38.3 - diff --git a/pkgs/0002-fix-django-version-bound.patch b/pkgs/0002-fix-django-version-bound.patch deleted file mode 100644 index 43d97a9..0000000 --- a/pkgs/0002-fix-django-version-bound.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 59895529d6449b9a85d1be25d404b9f2a3ceee0e Mon Sep 17 00:00:00 2001 -From: stuebinm -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/crs-tools-add-lockfile.patch b/pkgs/crs-tools-add-lockfile.patch new file mode 100644 index 0000000..a8cd3ce --- /dev/null +++ b/pkgs/crs-tools-add-lockfile.patch @@ -0,0 +1,47 @@ +From 339d2c0c3df062eee919691740e8d5b4d4b5bc30 Mon Sep 17 00:00:00 2001 +From: stuebinm +Date: Tue, 28 Mar 2023 01:54:24 +0200 +Subject: [PATCH] add lockfile + +--- + composer.lock | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + create mode 100644 composer.lock + +diff --git a/composer.lock b/composer.lock +new file mode 100644 +index 00000000..d2b67b38 +--- /dev/null ++++ b/composer.lock +@@ -0,0 +1,28 @@ ++{ ++ "_readme": [ ++ "This file locks the dependencies of your project to a known state", ++ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", ++ "This file is @generated automatically" ++ ], ++ "content-hash": "b3c1951928eb81c8bcfcace0c956b376", ++ "packages": [], ++ "packages-dev": [], ++ "aliases": [], ++ "minimum-stability": "stable", ++ "stability-flags": [], ++ "prefer-stable": false, ++ "prefer-lowest": false, ++ "platform": { ++ "php": ">=7.1.0", ++ "ext-apcu": "*", ++ "ext-curl": "*", ++ "ext-intl": "*", ++ "ext-mbstring": "*", ++ "ext-openssl": "*", ++ "ext-xdiff": "*", ++ "ext-xmlrpc": "*", ++ "ext-xsl": "*" ++ }, ++ "platform-dev": [], ++ "plugin-api-version": "2.3.0" ++} +-- +2.38.4 + 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/glitchtip-fix-poetry-name.patch b/pkgs/glitchtip-fix-poetry-name.patch new file mode 100644 index 0000000..9cc82bd --- /dev/null +++ b/pkgs/glitchtip-fix-poetry-name.patch @@ -0,0 +1,23 @@ +From 6a38df44cc64a4952528afe71c03c3931526af15 Mon Sep 17 00:00:00 2001 +From: stuebinm +Date: Wed, 22 Mar 2023 00:36:23 +0100 +Subject: [PATCH] fix poetry name issue + +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 9eb393a..1704691 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,5 +1,5 @@ + [tool.poetry] +-name = "glitchtip-backend" ++name = "glitchtip" + version = "0.1.0" + description = "Django backend that powers GlitchTip, an open source reimplementation of Sentry" + authors = ["David Burke"] +-- +2.38.3 + diff --git a/pkgs/glitchtip-fix-versions.patch b/pkgs/glitchtip-fix-versions.patch new file mode 100644 index 0000000..43d97a9 --- /dev/null +++ b/pkgs/glitchtip-fix-versions.patch @@ -0,0 +1,25 @@ +From 59895529d6449b9a85d1be25d404b9f2a3ceee0e Mon Sep 17 00:00:00 2001 +From: stuebinm +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 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 - ]; -} -- cgit v1.2.3