Compare commits
9 commits
2a08a90103
...
5ece113000
Author | SHA1 | Date | |
---|---|---|---|
5ece113000 | |||
9168660c1a | |||
31775afac0 | |||
be78512192 | |||
e4002035d5 | |||
828a7c22bd | |||
e24be19c75 | |||
d59d362f8d | |||
62b128fbaf |
10 changed files with 121 additions and 86 deletions
72
flake.lock
72
flake.lock
|
@ -54,11 +54,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715914213,
|
||||
"narHash": "sha256-QiukFbOYCdlpmbG7MTTSq4CCU9blp4rSA21veX9vyKY=",
|
||||
"lastModified": 1716000408,
|
||||
"narHash": "sha256-jIGTdIcHtRpY3fcfNUbcTv2IOVGW9srUzLrcYgK07Ik=",
|
||||
"owner": "atuinsh",
|
||||
"repo": "atuin",
|
||||
"rev": "64b7581644e2dbc4d1f31f220158c0cc321f2139",
|
||||
"rev": "95c91689441c66228cd8eb2e94e9b43a848d75f4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -195,11 +195,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715872464,
|
||||
"narHash": "sha256-mkZ3hrPG7d+qL7B6pQcrNfPh2mnQEJR3FHK93qCp6Uk=",
|
||||
"lastModified": 1716168343,
|
||||
"narHash": "sha256-82oT27w9smpItZ+PyN2C0PjIwZYbIocwXSM4u1igXuc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "5f6dbcce99d60dd77f96dfc66d06bbea149a40e1",
|
||||
"rev": "6f01b9710bc4d3bf006eb8df928b4b15e0430901",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -219,11 +219,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715910562,
|
||||
"narHash": "sha256-5H1xZ7LgJGEGjVgLMSJYftyrIt0zmmJGX9XMxdT1q3k=",
|
||||
"lastModified": 1716196045,
|
||||
"narHash": "sha256-WLxzdjUlIuf56IYdILyrDUtyUhRlWsiCF7xuhunErMA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "238eefc3f18c7079b2ec3fa4c1b9b11e1c7dcc7c",
|
||||
"rev": "96e0ae1f75b858ce26b84fb2b4bb2a0249dab918",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -563,11 +563,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715486357,
|
||||
"narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
|
||||
"lastModified": 1715930644,
|
||||
"narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
|
||||
"rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -655,11 +655,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714987925,
|
||||
"narHash": "sha256-8gG1yIsha3bOUNs2cyOrC1I2E30G3R7bGoHsGO5bhkY=",
|
||||
"lastModified": 1716116133,
|
||||
"narHash": "sha256-CwOldvBBXr1K2Zr6z5chHtieBBIQqk+k5RKt3hkF1OU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-ld-rs",
|
||||
"rev": "57342044b03b7faa4c949d492c80527ad693194c",
|
||||
"rev": "bca096389e440f0f20a6a795546f65e2f2f7410d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -670,11 +670,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1715881912,
|
||||
"narHash": "sha256-e4LJk5uV1wvrRkffGFZekPWvFUx29NnnOahBlLaq8Ek=",
|
||||
"lastModified": 1716173274,
|
||||
"narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "ff1be1e3cdf884df0935ab28745ab13c3c26d828",
|
||||
"rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -729,11 +729,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1715668745,
|
||||
"narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=",
|
||||
"lastModified": 1716061101,
|
||||
"narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843",
|
||||
"rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -761,11 +761,11 @@
|
|||
},
|
||||
"nixpkgs-stable_4": {
|
||||
"locked": {
|
||||
"lastModified": 1715458492,
|
||||
"narHash": "sha256-q0OFeZqKQaik2U8wwGDsELEkgoZMK7gvfF6tTXkpsqE=",
|
||||
"lastModified": 1716061101,
|
||||
"narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8e47858badee5594292921c2668c11004c3b0142",
|
||||
"rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -777,11 +777,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1715787315,
|
||||
"narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
|
||||
"lastModified": 1716137900,
|
||||
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
|
||||
"rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -905,11 +905,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715912155,
|
||||
"narHash": "sha256-UXHk4dKvvm5mSuDDON3lXU5CHKiTRnIjA5mUtDOtKEU=",
|
||||
"lastModified": 1716171463,
|
||||
"narHash": "sha256-lc7wOh5BjYUoxdhcPkeUY8BmuL2qtRaHlW1403RW48E=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "d3a96b08a7280a5753246129b462eed3662815d5",
|
||||
"rev": "04d61d14803854fd8453ec43c5c53a471e5407a8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -926,11 +926,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715482972,
|
||||
"narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=",
|
||||
"lastModified": 1716087663,
|
||||
"narHash": "sha256-zuSAGlx8Qk0OILGCC2GUyZ58/SJ5R3GZdeUNQ6IS0fQ=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e",
|
||||
"rev": "0bf1808e70ce80046b0cff821c019df2b19aabf5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1008,11 +1008,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714058656,
|
||||
"narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
|
||||
"lastModified": 1715940852,
|
||||
"narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
|
||||
"rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
pre-commit-hooks = {
|
||||
url = "github:cachix/git-hooks.nix";
|
||||
inputs = {
|
||||
flake-utils.follows = "flake-utils";
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
@ -276,6 +275,7 @@
|
|||
headscale-ui = pkgs.callPackage ./pkgs/headscale-ui { };
|
||||
incus-ui = pkgs.callPackage ./pkgs/incus-ui { };
|
||||
openfga = pkgs.callPackage ./pkgs/openfga { };
|
||||
tinyows = pkgs.callPackage ./pkgs/tinyows { };
|
||||
zed = pkgs.callPackage ./pkgs/zed { };
|
||||
};
|
||||
|
||||
|
|
|
@ -1,4 +1,9 @@
|
|||
{ nixos-hardware, nix-ld-rs, ... }:
|
||||
{
|
||||
nixos-hardware,
|
||||
nix-ld-rs,
|
||||
attic,
|
||||
...
|
||||
}:
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
imports = [
|
||||
|
@ -488,19 +493,24 @@
|
|||
];
|
||||
};
|
||||
|
||||
# nix.settings.post-build-hook =
|
||||
# let
|
||||
# inherit (attic.packages.${pkgs.system}) attic-client;
|
||||
# in
|
||||
# pkgs.writeScript "upload-to-cache" ''
|
||||
# set -eu
|
||||
# set -f
|
||||
# export IFS=' '
|
||||
nix.settings.post-build-hook =
|
||||
let
|
||||
inherit (attic.packages.${pkgs.system}) attic-client;
|
||||
cachedPackagePatterns = builtins.concatStringsSep "|" [ "mongodb" ];
|
||||
in
|
||||
pkgs.writeScript "upload-to-cache" ''
|
||||
set -eu
|
||||
set -f
|
||||
export IFS=' '
|
||||
|
||||
# OUT_PATHS=$(echo -n ''${OUT_PATHS} | ${pkgs.gawk}/bin/awk 'BEGIN { RS = " "; ORS = " "; } $0 !~ /horus_vcpkg/ { print $0 }')
|
||||
# echo "Uploading paths to cache " ''${OUT_PATHS}
|
||||
# exec ${attic-client}/bin/attic push main ''${OUT_PATHS}
|
||||
# '';
|
||||
OUT_PATHS=$(echo -n ''${OUT_PATHS} | ${pkgs.gawk}/bin/awk 'BEGIN { RS = " "; ORS = " "; } $0 ~ /(${cachedPackagePatterns})/ { print $0 }')
|
||||
if [[ -z "''${OUT_PATHS}" ]]; then
|
||||
echo "No matching packages to upload"
|
||||
exit 0
|
||||
fi
|
||||
echo "Uploading paths to cache " ''${OUT_PATHS}
|
||||
exec ${attic-client}/bin/attic push main ''${OUT_PATHS}
|
||||
'';
|
||||
|
||||
sops.defaultSopsFile = ./secrets.yaml;
|
||||
sops.secrets = {
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
virtualisation = {
|
||||
incus = {
|
||||
enable = true;
|
||||
ui.enable = true;
|
||||
preseed = {
|
||||
networks = [
|
||||
{
|
||||
|
@ -121,9 +122,9 @@
|
|||
pkgs.e2fsprogs
|
||||
pkgs.kmod
|
||||
];
|
||||
environment = {
|
||||
INCUS_UI = pkgs.incus-ui;
|
||||
};
|
||||
# environment = {
|
||||
# INCUS_UI = pkgs.incus-ui;
|
||||
# };
|
||||
};
|
||||
incus-preseed = {
|
||||
path = [ pkgs.lvm2 ];
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
version = "750df081a3cc63f325ecfde6c30a974dc0e4bf56";
|
||||
}
|
||||
];
|
||||
vendorHash = "sha256-X4PSkXURIJxt7ouf5jQ7j3kJegsPsk8cqXEt6kyVnVY=";
|
||||
vendorHash = "sha256-tuHr5oYmx3HNmsO6ZOO14vORArk8YHZBsodCiydf6k8=";
|
||||
};
|
||||
|
||||
config = ''
|
||||
|
|
|
@ -7,27 +7,6 @@
|
|||
with lib;
|
||||
let
|
||||
cfg = config.eboskma.keycloak;
|
||||
|
||||
keywindTheme = pkgs.stdenv.mkDerivation {
|
||||
pname = "keycloak-theme-keywind";
|
||||
version = "unstable-2023-12-13";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "lukin";
|
||||
repo = "keywind";
|
||||
rev = "bdf966fdae0071ccd46dab4efdc38458a643b409";
|
||||
hash = "sha256-8N+OQ6Yg9RKxqGd8kgsbvrYuVgol49bo/iJeIJXr3Sg=";
|
||||
};
|
||||
|
||||
doConfigure = false;
|
||||
doBuild = false;
|
||||
doCheck = false;
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -r $src/theme/keywind/* $out/
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
options.eboskma.keycloak = {
|
||||
|
@ -47,10 +26,6 @@ in
|
|||
features = "docker";
|
||||
};
|
||||
|
||||
themes = {
|
||||
keywind = keywindTheme;
|
||||
};
|
||||
|
||||
plugins = [
|
||||
(pkgs.callPackage ./keycloak-orgs.nix {
|
||||
inherit (pkgs) fetchFromGitHub;
|
||||
|
|
|
@ -14,12 +14,12 @@ buildMavenPackage {
|
|||
owner = "keycloak";
|
||||
repo = "keycloak";
|
||||
rev = version;
|
||||
sha256 = "u9A/enVJwXqPRXyCsuSCloKcoYSKtEfuaJWJeNYsgVk=";
|
||||
sha256 = "+T8Y3/CkWFslhzGH+5uceb7hYJioxivMkLHTBYvq7KM=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/integration/admin-client";
|
||||
|
||||
mvnHash = "sha256-XTXdDxNO9rwRFbfLG1+gHExddJnNbhjRuIQJDrgmhxI=";
|
||||
mvnHash = "sha256-6vlH568z0oeBZQu953DNMkpneqzwFh9o7wmG1iOaoxA=";
|
||||
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ buildMavenPackage, fetchFromGitHub }:
|
||||
let
|
||||
version = "0.70";
|
||||
version = "0.72";
|
||||
in
|
||||
buildMavenPackage {
|
||||
inherit version;
|
||||
|
@ -10,13 +10,13 @@ buildMavenPackage {
|
|||
owner = "p2-inc";
|
||||
repo = "keycloak-orgs";
|
||||
rev = "v${version}";
|
||||
sha256 = "VsPANkqKOTKlh2TJt7kzYoLr4T7v86g7HocmWxG/z7A=";
|
||||
sha256 = "HaetCeTjXW+4OM7UZkmryynASF/QUb6bPEWCMzKB0h8=";
|
||||
# sha256 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
mvnHash = "sha256-SXq4WxPgjJyO/DLvhptz5vOq3oOfmABygYFkl2C3HtI=";
|
||||
mvnHash = "sha256-HfLuUy22JgRK0M8h0BQ31OMboY2XDo+eTt/TmYhHPZo=";
|
||||
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
|
||||
|
||||
mvnParameters = "--batch-mode -DskipTests -Dmaven.test.skip=true -Dmaven.buildNumber.skip=true";
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
let
|
||||
version = "24.0.2.1712258262";
|
||||
version = "24.0.4.1715362488";
|
||||
jarVersion = "24.0.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
|||
owner = "p2-inc";
|
||||
repo = "phasetwo-containers";
|
||||
rev = "v${version}";
|
||||
sha256 = "OwqbcZfhlSkm7ilK1+D+fGnnIfCsu4v76hFFPbWWsas=";
|
||||
sha256 = "J8ffCVYmDGi/eLlTTcR+k73f9nXlCQoCY7GNMi5f584=";
|
||||
# sha256 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
|
||||
};
|
||||
|
||||
|
|
49
pkgs/tinyows/default.nix
Normal file
49
pkgs/tinyows/default.nix
Normal file
|
@ -0,0 +1,49 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
flex,
|
||||
fcgi,
|
||||
libxml2,
|
||||
postgresql,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tinyows";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MapServer";
|
||||
repo = "tinyows";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6s+zKR2rLb1f9NaS9i6Gky2sOD1NdBzNe1GTP20+RTE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
fcgi
|
||||
libxml2
|
||||
(postgresql.withPackages (ps: with ps; [ postgis ]))
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
flex
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
make install
|
||||
install -D -m 0755 tinyows $out/bin/tinyows
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Source code of the TinyOWS project. Please submit pull requests to the 'main' branch";
|
||||
homepage = "https://github.com/MapServer/tinyows";
|
||||
changelog = "https://github.com/MapServer/tinyows/blob/${src.rev}/NEWS";
|
||||
license = licenses.mit;
|
||||
mainProgram = "tinyows";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
Loading…
Reference in a new issue