portunus: bump to 2.0.0-beta1
This commit is contained in:
parent
ebb3fbe1f5
commit
d71ab866d3
|
@ -1,21 +1,21 @@
|
|||
diff --git a/internal/frontend/core.go b/internal/frontend/core.go
|
||||
index e44ff0c..17ca69e 100644
|
||||
index 5976377..7c67991 100644
|
||||
--- a/internal/frontend/core.go
|
||||
+++ b/internal/frontend/core.go
|
||||
@@ -56,8 +56,6 @@ func HTTPHandler(engine core.Engine, isBehindTLSProxy bool) http.Handler {
|
||||
r.Methods("POST").Path(`/users/{uid}/delete`).Handler(postUserDeleteHandler(engine))
|
||||
@@ -43,8 +43,6 @@ func HTTPHandler(nexus core.Nexus, isBehindTLSProxy bool) http.Handler {
|
||||
r.Methods("POST").Path(`/users/{uid}/delete`).Handler(postUserDeleteHandler(nexus))
|
||||
|
||||
r.Methods("GET").Path(`/groups`).Handler(getGroupsHandler(engine))
|
||||
- r.Methods("GET").Path(`/groups/new`).Handler(getGroupsNewHandler(engine))
|
||||
- r.Methods("POST").Path(`/groups/new`).Handler(postGroupsNewHandler(engine))
|
||||
r.Methods("GET").Path(`/groups/{name}/edit`).Handler(getGroupEditHandler(engine))
|
||||
r.Methods("POST").Path(`/groups/{name}/edit`).Handler(postGroupEditHandler(engine))
|
||||
r.Methods("GET").Path(`/groups/{name}/delete`).Handler(getGroupDeleteHandler(engine))
|
||||
r.Methods("GET").Path(`/groups`).Handler(getGroupsHandler(nexus))
|
||||
- r.Methods("GET").Path(`/groups/new`).Handler(getGroupsNewHandler(nexus))
|
||||
- r.Methods("POST").Path(`/groups/new`).Handler(postGroupsNewHandler(nexus))
|
||||
r.Methods("GET").Path(`/groups/{name}/edit`).Handler(getGroupEditHandler(nexus))
|
||||
r.Methods("POST").Path(`/groups/{name}/edit`).Handler(postGroupEditHandler(nexus))
|
||||
r.Methods("GET").Path(`/groups/{name}/delete`).Handler(getGroupDeleteHandler(nexus))
|
||||
diff --git a/internal/frontend/groups.go b/internal/frontend/groups.go
|
||||
index 056c8ef..a824f95 100644
|
||||
index 5ac6a75..ac59f4f 100644
|
||||
--- a/internal/frontend/groups.go
|
||||
+++ b/internal/frontend/groups.go
|
||||
@@ -50,7 +50,6 @@ func getGroupsHandler(e core.Engine) http.Handler {
|
||||
@@ -38,7 +38,6 @@ func getGroupsHandler(n core.Nexus) http.Handler {
|
||||
<th>Members</th>
|
||||
<th>Permissions granted</th>
|
||||
<th class="actions">
|
||||
|
|
|
@ -63,22 +63,24 @@ in
|
|||
|
||||
nixpkgs.overlays = [
|
||||
(final: prev: with final; {
|
||||
portunus = prev.portunus.overrideAttrs ({ patches ? [ ], ... }: {
|
||||
portunus = (prev.portunus.override { buildGoModule = buildGo121Module; }).overrideAttrs ({ patches ? [ ], buildInputs ? [ ], ... }: let
|
||||
version = "2.0.0-beta.1";
|
||||
in {
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "majewsky";
|
||||
repo = "portunus";
|
||||
rev = "aa68cec8bbabdf406351b1630e35a2e272e23d64";
|
||||
hash = "sha256-04QGBG1pUy8nnCDSCB/53R20qbDqh4W268Q/N+vmPxg=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ShPljeqAgDkgjcywale6Dh6TEIA5cgF64qhcj++b7Rk=";
|
||||
};
|
||||
|
||||
patches = patches ++ [
|
||||
# create new groups/users from seeds
|
||||
# https://github.com/majewsky/portunus/pull/20
|
||||
(fetchpatch {
|
||||
url = "https://github.com/majewsky/portunus/commit/70505c99cb6217cbaae7aa65f4637490ef0b30a2.patch";
|
||||
hash = "sha256-tyriNCJnrfBEiJfEP0UdAa48hkVFYrGw1jZFmxxWeZ0=";
|
||||
})
|
||||
] ++ lib.optional cfg.removeAddGroup ./portunus-remove-add-group.diff;
|
||||
patches = patches
|
||||
++ lib.optional cfg.removeAddGroup ./portunus-remove-add-group.diff;
|
||||
|
||||
buildInputs = buildInputs ++ [
|
||||
libxcrypt-legacy
|
||||
];
|
||||
});
|
||||
})
|
||||
];
|
||||
|
|
Loading…
Reference in New Issue