From 48ebdbb03ac4cc1bae2e67456483cf92dd3594ae Mon Sep 17 00:00:00 2001 From: ljf Date: Sat, 14 Jan 2023 23:40:23 +0100 Subject: [PATCH 01/16] [fix] LDAP connector with erland 24.3+ --- lib/service/auth/ldap_authenticator.ex | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/service/auth/ldap_authenticator.ex b/lib/service/auth/ldap_authenticator.ex index 6dba56edd..7a31b1997 100644 --- a/lib/service/auth/ldap_authenticator.ex +++ b/lib/service/auth/ldap_authenticator.ex @@ -132,9 +132,11 @@ defmodule Mobilizon.Service.Auth.LDAPAuthenticator do ) :: String.t() | {:error, :ldap_registration_missing_attributes} | any() defp search_user(connection, ldap, base, uid, email, group) do + Logger.debug("Searching for user") # We may need to bind before performing the search res = if Keyword.get(ldap, :require_bind_for_search, true) do + Logger.debug("Doing binding before search as it's required") admin_field = Keyword.get(ldap, :bind_uid) admin_password = Keyword.get(ldap, :bind_password) bind_user(connection, base, uid, admin_field, admin_password) @@ -153,7 +155,9 @@ defmodule Mobilizon.Service.Auth.LDAPAuthenticator do @spec do_search_user(any(), String.t(), String.t(), String.t(), String.t() | boolean()) :: String.t() | {:error, :ldap_registration_missing_attributes} | any() defp do_search_user(connection, base, uid, email, group) do - with {:ok, {:eldap_search_result, [{:eldap_entry, _, attributes}], _}} <- + Logger.debug("Searching user") + + with {:ok, {:eldap_search_result, [{:eldap_entry, _, attributes}], _, _}} <- :eldap.search(connection, [ {:base, to_charlist(base)}, {:filter, search_filter(email, group)}, From cef536d5b9573f78adf0b6771b3e976998c18d8c Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 16 Jan 2023 12:00:06 +0100 Subject: [PATCH 02/16] Fix LDAP authentificator tests Signed-off-by: Thomas Citharel --- test/service/auth/ldap_authentificator_test.exs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/service/auth/ldap_authentificator_test.exs b/test/service/auth/ldap_authentificator_test.exs index 6168f8594..9136c2171 100644 --- a/test/service/auth/ldap_authentificator_test.exs +++ b/test/service/auth/ldap_authentificator_test.exs @@ -62,7 +62,8 @@ defmodule Mobilizon.Service.Auth.LDAPAuthenticatorTest do wholeSubtree: fn -> :ok end, search: fn _connection, _options -> {:ok, - {:eldap_search_result, [{:eldap_entry, '', [{'cn', [to_charlist("MyUser")]}]}], []}} + {:eldap_search_result, [{:eldap_entry, '', [{'cn', [to_charlist("MyUser")]}]}], [], + []}} end, close: fn _connection -> send(self(), :close_connection) @@ -110,7 +111,8 @@ defmodule Mobilizon.Service.Auth.LDAPAuthenticatorTest do wholeSubtree: fn -> :ok end, search: fn _connection, _options -> {:ok, - {:eldap_search_result, [{:eldap_entry, '', [{'cn', [to_charlist("MyUser")]}]}], []}} + {:eldap_search_result, [{:eldap_entry, '', [{'cn', [to_charlist("MyUser")]}]}], [], + []}} end, close: fn _connection -> send(self(), :close_connection) From 20fc9d1f6b7fe0e08aa28f495fba7c0eb1ce4686 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 20 Mar 2023 16:38:43 +0100 Subject: [PATCH 03/16] Fetch config for export event participant formats Signed-off-by: Thomas Citharel --- js/src/graphql/config.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/src/graphql/config.ts b/js/src/graphql/config.ts index b55fb06de..e122f9650 100644 --- a/js/src/graphql/config.ts +++ b/js/src/graphql/config.ts @@ -112,6 +112,9 @@ export const CONFIG = gql` isDefault } } + exportFormats { + eventParticipants + } } } `; From 0837090e3000fda92964c9bd6cd1d4d9aae98974 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 20 Mar 2023 18:26:33 +0100 Subject: [PATCH 04/16] Bump version to 3.0.4 Signed-off-by: Thomas Citharel --- CHANGELOG.md | 9 +++++++++ js/package.json | 2 +- mix.exs | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b0e63151..c4dec2e6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## 3.0.4 - 2023-03-20 + +### Fixed + +- LDAP connector with Erlang 24.3+ +- Participant export configuration not being loaded + + ## 3.0.3 - 2022-12-22 ### Fixed diff --git a/js/package.json b/js/package.json index 9d1585ca1..393e31403 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "mobilizon", - "version": "3.0.3", + "version": "3.0.4", "private": true, "scripts": { "dev": "vite", diff --git a/mix.exs b/mix.exs index ba4d8f610..dcdafe25d 100644 --- a/mix.exs +++ b/mix.exs @@ -1,7 +1,7 @@ defmodule Mobilizon.Mixfile do use Mix.Project - @version "3.0.3" + @version "3.0.4" def project do [ From 1b9aafa855f60ebb9ee904fbd32bdfe0eed22c1c Mon Sep 17 00:00:00 2001 From: 778a69cd <778a69cd@potsda.mn> Date: Tue, 24 May 2022 16:28:51 +0200 Subject: [PATCH 05/16] remove pictures for error and 404 site --- js/src/views/PageNotFound.vue | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/js/src/views/PageNotFound.vue b/js/src/views/PageNotFound.vue index 84dcd656e..b0354afa5 100644 --- a/js/src/views/PageNotFound.vue +++ b/js/src/views/PageNotFound.vue @@ -2,20 +2,6 @@
- - - - -

{{ $t("The page you're looking for doesn't exist.") }}

From d53f7b93e9efb560c335afe5992f9ce651c1409d Mon Sep 17 00:00:00 2001 From: 778a69cd <778a69cd@potsda.mn> Date: Tue, 24 May 2022 17:00:09 +0200 Subject: [PATCH 06/16] Use our own categories for event creation --- lib/mobilizon/events/categories.ex | 116 ++++++++----------------- priv/gettext/de/LC_MESSAGES/default.po | 96 +++++++++++--------- priv/gettext/en/LC_MESSAGES/default.po | 68 ++++++++++++--- 3 files changed, 145 insertions(+), 135 deletions(-) diff --git a/lib/mobilizon/events/categories.ex b/lib/mobilizon/events/categories.ex index 0ebb5a164..3541e7fd8 100644 --- a/lib/mobilizon/events/categories.ex +++ b/lib/mobilizon/events/categories.ex @@ -28,126 +28,82 @@ defmodule Mobilizon.Events.Categories do defp build_in_categories do [ %{ - id: :arts, - label: gettext("Arts") + id: :ausflug, + label: gettext("Ausflug") }, %{ - id: :book_clubs, - label: gettext("Book clubs") + id: :ausstellung, + label: gettext("Ausstellung") }, %{ - id: :business, - label: gettext("Business") + id: :demonstration, + label: gettext("Demonstration") }, %{ - id: :causes, - label: gettext("Causes") + id: :einweihung, + label: gettext("Einweihung") }, %{ - id: :comedy, - label: gettext("Comedy") + id: :filmvorfuehrung, + label: gettext("Filmvorführung") }, %{ - id: :crafts, - label: gettext("Crafts") + id: :fussball, + label: gettext("Fußball") }, %{ - id: :food_drink, - label: gettext("Food & Drink") + id: :gedenken, + label: gettext("Gedenken") }, %{ - id: :health, - label: gettext("Health") + id: :infostand, + label: gettext("Infostand") }, %{ - id: :music, - label: gettext("Music") + id: :kuenstlerisches, + label: gettext("Künstlerisches") }, %{ - id: :auto_boat_air, - label: gettext("Auto, boat and air") + id: :kneipe, + label: gettext("Kneipe") }, %{ - id: :community, - label: gettext("Community") + id: :konzert, + label: gettext("Konzert") }, %{ - id: :family_education, - label: gettext("Family & Education") + id: :kuefa, + label: gettext("KüFa") }, %{ - id: :fashion_beauty, - label: gettext("Fashion & Beauty") - }, - %{ - id: :film_media, - label: gettext("Film & Media") - }, - %{ - id: :games, - label: gettext("Games") - }, - %{ - id: :language_culture, - label: gettext("Language & Culture") - }, - %{ - id: :learning, - label: gettext("Learning") - }, - %{ - id: :lgbtq, - label: gettext("LGBTQ") - }, - %{ - id: :movements_politics, - label: gettext("Movements and politics") - }, - %{ - id: :networking, - label: gettext("Networking") + id: :lesung, + label: gettext("Lesung") }, %{ id: :party, label: gettext("Party") }, %{ - id: :performing_visual_arts, - label: gettext("Performing & Visual Arts") + id: :sport, + label: gettext("Sport") }, %{ - id: :pets, - label: gettext("Pets") + id: :theater, + label: gettext("Theater") }, %{ - id: :photography, - label: gettext("Photography") + id: :verhandlung, + label: gettext("Verhandlung") }, %{ - id: :outdoors_adventure, - label: gettext("Outdoors & Adventure") - }, - %{ - id: :spirituality_religion_beliefs, - label: gettext("Spirituality, Religion & Beliefs") - }, - %{ - id: :science_tech, - label: gettext("Science & Tech") - }, - %{ - id: :sports, - label: gettext("Sports") - }, - %{ - id: :theatre, - label: gettext("Theatre") + id: :workshop, + label: gettext("Workshop") }, # Legacy default value %{ id: :meeting, - label: gettext("Meeting") - } + label: gettext("Infoveranstaltung") + }, ] end diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 39c150680..c2fc8c607 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -2309,42 +2309,7 @@ msgstr "LGBTQ" msgid "Language & Culture" msgstr "Sprache & Kultur" -#: lib/mobilizon/events/categories.ex:96 -#, elixir-autogen, elixir-format -msgid "Learning" -msgstr "Lernen" - -#: lib/mobilizon/events/categories.ex:149 -#, elixir-autogen, elixir-format -msgid "Meeting" -msgstr "Treffen" - -#: lib/mobilizon/events/categories.ex:104 -#, elixir-autogen, elixir-format -msgid "Movements and politics" -msgstr "Bewegungen und Politik" - -#: lib/mobilizon/events/categories.ex:64 -#, elixir-autogen, elixir-format -msgid "Music" -msgstr "Musik" - -#: lib/mobilizon/events/categories.ex:108 -#, elixir-autogen, elixir-format -msgid "Networking" -msgstr "Netzwerke" - -#: lib/mobilizon/events/categories.ex:128 -#, elixir-autogen, elixir-format -msgid "Outdoors & Adventure" -msgstr "Natur & Abenteuer" - -#: lib/mobilizon/events/categories.ex:112 -#, elixir-autogen, elixir-format -msgid "Party" -msgstr "Party" - -#: lib/mobilizon/events/categories.ex:116 +#: lib/mobilizon/events/categories.ex:100 #, elixir-autogen, elixir-format msgid "Performing & Visual Arts" msgstr "Darstellende & bildende Kunst" @@ -2369,16 +2334,63 @@ msgstr "Wissenschaft & Technologie" msgid "Spirituality, Religion & Beliefs" msgstr "Glauben, Religion & Spiritualität" -#: lib/mobilizon/events/categories.ex:140 -#, elixir-autogen, elixir-format -msgid "Sports" +msgid "Ausflug" +msgstr "Ausflug" + +msgid "Ausstellung" +msgstr "Ausstellung" + +msgid "Demonstration" +msgstr "Demonstration" + +msgid "Einweihung" +msgstr "Einweihung" + +msgid "Filmvorführung" +msgstr "Filmvorführung" + +msgid "Fußball" +msgstr "Fußball" + +msgid "Gedenken" +msgstr "Gedenken" + +msgid "Infostand" +msgstr "Infostand" + +msgid "Infoveranstaltung" +msgstr "Infoveranstaltung" + +msgid "Künstlerisches" +msgstr "Künstlerisches" + +msgid "Kneipe" +msgstr "Kneipe" + +msgid "Konzert" +msgstr "Konzert" + +msgid "KüFa" +msgstr "KüFa" + +msgid "Lesung" +msgstr "Lesung" + +msgid "Party" +msgstr "Party" + +msgid "Sport" msgstr "Sport" -#: lib/mobilizon/events/categories.ex:144 -#, elixir-autogen, elixir-format -msgid "Theatre" +msgid "Theater" msgstr "Theater" +msgid "Verhandlung" +msgstr "Verhandlung" + +msgid "Workshop" +msgstr "Workshop" + #: lib/web/templates/email/participation/event_card.text.eex:9 #, elixir-autogen, elixir-format msgid "Read more: %{url}" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 2c42c240e..03b7418d9 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -1964,11 +1964,6 @@ msgstr "" #: lib/mobilizon/events/categories.ex:112 #, elixir-autogen, elixir-format -msgid "Party" -msgstr "" - -#: lib/mobilizon/events/categories.ex:116 -#, elixir-autogen, elixir-format msgid "Performing & Visual Arts" msgstr "" @@ -1992,15 +1987,62 @@ msgstr "" msgid "Spirituality, Religion & Beliefs" msgstr "" -#: lib/mobilizon/events/categories.ex:140 -#, elixir-autogen, elixir-format -msgid "Sports" -msgstr "" +msgid "Ausflug" +msgstr "Excursion" -#: lib/mobilizon/events/categories.ex:144 -#, elixir-autogen, elixir-format -msgid "Theatre" -msgstr "" +msgid "Ausstellung" +msgstr "Exhibition" + +msgid "Demonstration" +msgstr "Demonstration" + +msgid "Einweihung" +msgstr "Inauguration" + +msgid "Filmvorführung" +msgstr "Film screening" + +msgid "Fußball" +msgstr "Football" + +msgid "Gedenken" +msgstr "Remembrance" + +msgid "Infostand" +msgstr "Infostand" + +msgid "Infoveranstaltung" +msgstr "Info event" + +msgid "Künstlerisches" +msgstr "Art related" + +msgid "Kneipe" +msgstr "Bar" + +msgid "Konzert" +msgstr "Concert" + +msgid "KüFa" +msgstr "Kitchen for all" + +msgid "Lesung" +msgstr "Reading" + +msgid "Party" +msgstr "Party" + +msgid "Sport" +msgstr "Sport" + +msgid "Theater" +msgstr "Theater" + +msgid "Verhandlung" +msgstr "Trial" + +msgid "Workshop" +msgstr "Workshop" #: lib/web/templates/email/participation/event_card.text.eex:9 #, elixir-autogen, elixir-format, fuzzy From dcd097bf6d0253e5b8fc0c3b0c531a1d5aaeb812 Mon Sep 17 00:00:00 2001 From: 778a69cd <778a69cd@potsda.mn> Date: Tue, 24 May 2022 19:41:05 +0200 Subject: [PATCH 07/16] default anonymous participation in events to true --- js/src/types/event-options.model.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/types/event-options.model.ts b/js/src/types/event-options.model.ts index 420e21919..a954c8e2d 100644 --- a/js/src/types/event-options.model.ts +++ b/js/src/types/event-options.model.ts @@ -37,7 +37,7 @@ export class EventOptions implements IEventOptions { showRemainingAttendeeCapacity = false; - anonymousParticipation = false; + anonymousParticipation = true; hideOrganizerWhenGroupEvent = false; From 0824694c5636f974a7afd90b21d275c16db61847 Mon Sep 17 00:00:00 2001 From: 778a69cd <778a69cd@potsda.mn> Date: Tue, 24 May 2022 21:08:16 +0200 Subject: [PATCH 08/16] Revert "default anonymous participation in events to true" This reverts commit 3a1b7a4660b4fd9488e7d06e677027ae41e0c10c. --- js/src/types/event-options.model.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/types/event-options.model.ts b/js/src/types/event-options.model.ts index a954c8e2d..420e21919 100644 --- a/js/src/types/event-options.model.ts +++ b/js/src/types/event-options.model.ts @@ -37,7 +37,7 @@ export class EventOptions implements IEventOptions { showRemainingAttendeeCapacity = false; - anonymousParticipation = true; + anonymousParticipation = false; hideOrganizerWhenGroupEvent = false; From 23378a378a2ac710562713780de3c14cc573b2c4 Mon Sep 17 00:00:00 2001 From: 778a69cd <778a69cd@potsda.mn> Date: Sat, 2 Jul 2022 19:33:52 +0200 Subject: [PATCH 09/16] add Mobilizon version to instance config --- lib/mobilizon/config.ex | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/mobilizon/config.ex b/lib/mobilizon/config.ex index abafe9ece..d14563bda 100644 --- a/lib/mobilizon/config.ex +++ b/lib/mobilizon/config.ex @@ -19,6 +19,7 @@ defmodule Mobilizon.Config do registration_email_denylist: list(String.t()), demo: boolean(), repository: String.t(), + version: String.t(), email_from: String.t(), email_reply_to: String.t(), federating: boolean(), @@ -102,9 +103,7 @@ defmodule Mobilizon.Config do end @spec instance_version :: String.t() - def instance_version do - GitStatus.commit() - end + def instance_version, do: instance_config()[:version] @spec instance_hostname :: String.t() def instance_hostname, do: instance_config()[:hostname] From aa043d8793464e978da402b911eb79accc686088 Mon Sep 17 00:00:00 2001 From: 778a69cd <778a69cd@potsda.mn> Date: Wed, 5 Oct 2022 12:52:12 +0200 Subject: [PATCH 10/16] fix wrong link in instance follow request email this is upstreamable --- lib/web/templates/email/instance_follow.text.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/web/templates/email/instance_follow.text.eex b/lib/web/templates/email/instance_follow.text.eex index 930a7ed2d..7e85bbb22 100644 --- a/lib/web/templates/email/instance_follow.text.eex +++ b/lib/web/templates/email/instance_follow.text.eex @@ -7,4 +7,4 @@ <%= if @follower.type == :Application do %><%= gettext "Note: %{name} following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too.", name: Mobilizon.Actors.Actor.display_name_and_username(@follower) %><% end %> <%= if @follower.type == :Application do %><%= gettext "To accept this invitation, head over to the instance's admin settings." %><% else %><%= gettext "To accept this invitation, head over to the profile's admin page." %><% end %> -<%= if @follower.type == :Application do %><%= "#{Mobilizon.Web.Endpoint.url()}/settings/admin/relays/followers" %><% else %><%= "#{Mobilizon.Web.Endpoint.url()}/settings/admin/profiles/#{@follower.id}" %><% end %> +<%= if @follower.type == :Application do %><%= "#{Mobilizon.Web.Endpoint.url()}/settings/admin/instances/%{name}" %><% else %><%= "#{Mobilizon.Web.Endpoint.url()}/settings/admin/profiles/#{@follower.id}" %><% end %> From d2af20dd59ecdf8dbedc07f9e0db96e5ba472763 Mon Sep 17 00:00:00 2001 From: 778a69cd <778a69cd@potsda.mn> Date: Tue, 21 Mar 2023 13:53:49 +0100 Subject: [PATCH 11/16] show events until their end time, unless they have no end time --- lib/mobilizon/events/events.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mobilizon/events/events.ex b/lib/mobilizon/events/events.ex index aedc9d394..e0f05cfc5 100644 --- a/lib/mobilizon/events/events.ex +++ b/lib/mobilizon/events/events.ex @@ -1811,7 +1811,7 @@ defmodule Mobilizon.Events do @spec filter_future_events(Ecto.Queryable.t(), boolean) :: Ecto.Query.t() defp filter_future_events(query, true) do from(q in query, - where: q.begins_on > ^DateTime.utc_now() + where: coalesce(q.ends_on, q.begins_on) > ^DateTime.utc_now() ) end From 438f1dde3e3d347589ca2e19fe40209cb88bd6aa Mon Sep 17 00:00:00 2001 From: 778a69cd <778a69cd@potsda.mn> Date: Wed, 15 Mar 2023 21:57:31 +0100 Subject: [PATCH 12/16] init nix flake --- flake.lock | 27 +++++++++++++++++++++++++++ flake.nix | 23 +++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 000000000..6cd15991f --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1678819893, + "narHash": "sha256-lfA6WGdxPsPkBK5Y19ltr5Sn7v7MlT+jpZ4nUgco0Xs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7067edc68c035e21780259ed2d26e1f164addaa2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 000000000..57bf7a811 --- /dev/null +++ b/flake.nix @@ -0,0 +1,23 @@ +{ + description = "A very basic flake"; + + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + + outputs = { self, nixpkgs }: { + + packages.x86_64-linux.hello = nixpkgs.legacyPackages.x86_64-linux.hello; + + packages.x86_64-linux.default = self.packages.x86_64-linux.hello; + + devShells.x86_64-linux.default = let + pkgs = import nixpkgs { system = "x86_64-linux"; }; + in pkgs.mkShell { + buildInputs = with pkgs; [ + elixir + cmake + imagemagick + ]; + }; + + }; +} From d830597206ca39da2bb2cb4affa207616c68c0d2 Mon Sep 17 00:00:00 2001 From: 778a69cd <778a69cd@potsda.mn> Date: Tue, 4 Apr 2023 23:41:15 +0200 Subject: [PATCH 13/16] use nixpkgs from september 2022 for nix devShell --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 6cd15991f..e589abfe2 100644 --- a/flake.lock +++ b/flake.lock @@ -2,17 +2,17 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1678819893, - "narHash": "sha256-lfA6WGdxPsPkBK5Y19ltr5Sn7v7MlT+jpZ4nUgco0Xs=", + "lastModified": 1662116689, + "narHash": "sha256-UB5H2/AjhY5OgooCXeLxYpW9w/wYIwOWRDu+VdPo858=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7067edc68c035e21780259ed2d26e1f164addaa2", + "rev": "da141d2fef4636aca767188e7a9f6e89e65264ce", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "da141d2fef4636aca767188e7a9f6e89e65264ce", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 57bf7a811..c8ddb6202 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "A very basic flake"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/da141d2fef4636aca767188e7a9f6e89e65264ce"; outputs = { self, nixpkgs }: { From 8e00c78a119d062b601551b41d840a6b75fba81d Mon Sep 17 00:00:00 2001 From: 778a69cd <778a69cd@potsda.mn> Date: Tue, 4 Apr 2023 23:53:52 +0200 Subject: [PATCH 14/16] use yarn with an older nodejs version in devShell --- flake.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/flake.nix b/flake.nix index c8ddb6202..cc0dfdc31 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,9 @@ elixir cmake imagemagick + (yarn.override { + nodejs = pkgs.nodejs-16_x; + }) ]; }; From 773ddd22a79c78c0422df73ae61dd49964e2d43e Mon Sep 17 00:00:00 2001 From: summersamara Date: Wed, 5 Apr 2023 00:28:13 +0200 Subject: [PATCH 15/16] add elixir version 1.13.4 to Dockerfile for dev --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8d6afe8ee..91557dc2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM elixir:alpine +FROM elixir:1.13.4-alpine RUN apk add --no-cache inotify-tools postgresql-client yarn file make gcc libc-dev argon2 imagemagick cmake build-base libwebp-tools bash ncurses git python3 From 609512a9eddd90cc5e4ed3522940c469e083fed2 Mon Sep 17 00:00:00 2001 From: 778a69cd <778a69cd@potsda.mn> Date: Tue, 16 May 2023 00:24:01 +0200 Subject: [PATCH 16/16] use latest nixos-unstable in devShell, add mix2nix --- flake.lock | 8 ++++---- flake.nix | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index e589abfe2..75850d537 100644 --- a/flake.lock +++ b/flake.lock @@ -2,17 +2,17 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1662116689, - "narHash": "sha256-UB5H2/AjhY5OgooCXeLxYpW9w/wYIwOWRDu+VdPo858=", + "lastModified": 1684049129, + "narHash": "sha256-7WB9LpnPNAS8oI7hMoHeKLNhRX7k3CI9uWBRSfmOCCE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da141d2fef4636aca767188e7a9f6e89e65264ce", + "rev": "0470f36b02ef01d4f43c641bbf07020bcab71bf1", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "da141d2fef4636aca767188e7a9f6e89e65264ce", "type": "github" } }, diff --git a/flake.nix b/flake.nix index cc0dfdc31..edcd5fec8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "A very basic flake"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/da141d2fef4636aca767188e7a9f6e89e65264ce"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; outputs = { self, nixpkgs }: { @@ -14,6 +14,7 @@ in pkgs.mkShell { buildInputs = with pkgs; [ elixir + mix2nix cmake imagemagick (yarn.override {