privatevoid.net/depot
1
1
Fork 0
Code Issues 23 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

Merge pull request #58 from privatevoid-net/updates-20230129

Browse source 
Updates 20230129
This commit is contained in:
Max Headroom 2023-01-30 21:20:50 +00:00 committed by GitHub
commit 074e5165f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 103 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
flake.lock
View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1665870395,
"narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=",
"lastModified": 1675021904,
"narHash": "sha256-jkg8ZwPi0aYKxtaGvGXzxz14kGkGxMrdJZj2gGxRo3E=",
"owner": "ryantm",
"repo": "agenix",
"rev": "a630400067c6d03c9b3e0455347dc8559db14288",
"rev": "6d3a415637981b966f3bdb813aefcff405630a7f",
"type": "github"
},
"original": {
@ -127,11 +127,11 @@
]
},
"locked": {
"lastModified": 1673399964,
"narHash": "sha256-v6SrE4rcDAX78VxPZPfPSRXygJ08AfoESL+HcF5VPBQ=",
"lastModified": 1675023912,
"narHash": "sha256-4FR94JS4lNc1GeO7PKjrq0ktfbYwlDcqJUvJH7VOBuY=",
"owner": "max-privatevoid",
"repo": "dream2nix",
"rev": "67087477ada8f9309c3616ce06132c296225cdee",
"rev": "0140d77bada3a8f9884d2202195c3fea51968368",
"type": "github"
},
"original": {
@ -151,11 +151,11 @@
]
},
"locked": {
"lastModified": 1671279624,
"narHash": "sha256-zY+ZFkIftR/ygx59L6jK50OgJLAIcUdYljoLPMnzm7w=",
"lastModified": 1674180232,
"narHash": "sha256-Eqrcd6ayrwLthrOkQp8VshxUphC1is/lTk++8yC0/GA=",
"owner": "DavHau",
"repo": "drv-parts",
"rev": "f8bdb04964ef64e74bd227937cf6f4306478001b",
"rev": "26eceebedcffa68f93a761dde45cf0789f59be22",
"type": "github"
},
"original": {
@ -171,11 +171,11 @@
]
},
"locked": {
"lastModified": 1670441596,
"narHash": "sha256-+T487QnluBT5F9tVk0chG/zzv+9zzTrx3o7rlOBK7ps=",
"lastModified": 1674771137,
"narHash": "sha256-Zpk1GbEsYrqKmuIZkx+f+8pU0qcCYJoSUwNz1Zk+R00=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8d0e2444ab05f79df93b70e5e497f8c708eb6b9b",
"rev": "7c7a8bce3dffe71203dcd4276504d1cb49dfe05f",
"type": "github"
},
"original": {
@ -199,11 +199,27 @@
"type": "github"
}
},
"haskell-flake": {
"locked": {
"lastModified": 1674066917,
"narHash": "sha256-nRSAb7N64zmAbXUoVVqY/s2LbSIdDTdfN0sSKG5/CCY=",
"owner": "srid",
"repo": "haskell-flake",
"rev": "c6ff897db9abdd4e5ff7911b5f9234a1380c6611",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "haskell-flake",
"type": "github"
}
},
"hercules-ci-agent": {
"inputs": {
"flake-parts": [
"flake-parts"
],
"haskell-flake": "haskell-flake",
"nix-darwin": [
"blank"
],
@ -213,11 +229,11 @@
"pre-commit-hooks-nix": "pre-commit-hooks-nix"
},
"locked": {
"lastModified": 1673968502,
"narHash": "sha256-LR8oNDT4G3tjY4RhQHv0LoW7jtysPwtxYMryg6WUPhQ=",
"lastModified": 1674658417,
"narHash": "sha256-HqtPKh6A4I9TH6AJHwJyKAhBz9x+kJYYMiYJcZBGib0=",
"owner": "hercules-ci",
"repo": "hercules-ci-agent",
"rev": "2063a731d51041bc5922a16f88a2bcc39cf8f6a2",
"rev": "d79e8b2ca8142335097222e78cdf9953f2183eed",
"type": "github"
},
"original": {
@ -239,11 +255,11 @@
]
},
"locked": {
"lastModified": 1671710218,
"narHash": "sha256-c9QR6qTauyLru/2BrIQcgKX4eYR/JFdhbTt+piilO14=",
"lastModified": 1674152863,
"narHash": "sha256-Y5ROi4LeBT07tejuteHS1FeLUlsjgMJ9IC9Yo8GaN1U=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "9684190de4cd0e75859f1939d13973fce3a7ce46",
"rev": "c6c39dde5892d3cb8b4e81e851e21353c6c30506",
"type": "github"
},
"original": {
@ -348,11 +364,11 @@
},
"locked": {
"host": "git.privatevoid.net",
"lastModified": 1674088745,
"narHash": "sha256-IYIfjkbh3rrP7fTzhj26YZ8j/ZKLR5MEIrK4WoRMJIQ=",
"lastModified": 1674866006,
"narHash": "sha256-6xWH1moJwBwD/AbVbM6DRgCqF95N27RSGZCV2JJogI8=",
"owner": "max",
"repo": "nix-super",
"rev": "8909f06cae1c15ecc19ac2c84c09edd5fff37e80",
"rev": "792d83f2623ed0a54fa994c92305dcadf2e18369",
"type": "gitlab"
},
"original": {
@ -364,11 +380,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1673957332,
"narHash": "sha256-njH7Szk1BLVWGMw7IRibgGejSlxXHj9saZHfH20gHdk=",
"lastModified": 1674980507,
"narHash": "sha256-epLKnRtNk+UrWwjXyOdKZXm4ECAv7KM4VFY4TuWbwX0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b83e7f5a04a3acc8e92228b0c4bae68933d504eb",
"rev": "1a87dcd5669c34f10ceb312a09439ebbb9239069",
"type": "github"
},
"original": {

2
flake.nix
View file

@ -75,7 +75,7 @@
(host: mkDeploy host // (overrides.${host} or {}) );
effects = inputs.hercules-ci-effects.lib.withPkgs nixpkgsFor.x86_64-linux;
in flake-parts.lib.mkFlake { inherit self; } {
in flake-parts.lib.mkFlake { inherit inputs; } {
inherit systems;
flake = {
nixosModules = aspect.modules;

2
packages/build-support/drv-parts/dependency-sets/default.nix
View file

@ -1,7 +1,7 @@
{ pkgs, inputs', self', ... }:
{
dependencySets = {
drv-parts.dependencySets = {
inherit pkgs inputs' self';
inherit (pkgs) python3Packages;
};

8
packages/monitoring/grafana/default.nix
View file

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "9.2.1";
version = "9.3.6";
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-0TMvSILkT29Ebm/P3PK1NKNs+TbE+874aDRybahhMGg=";
sha256 = "sha256-7t30AvGtCyU02fOYWHYcMWgcnmkepUpZzUMR4NjIlvw=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-yL6qyAOZT47eiPkdxeBARkChP0L4vj1y7LDvrPUBmQQ=";
sha256 = "sha256-jRUPrb6ocqux4SrMm/Hw/2DuG7sj2jKhSln16ynjHwM=";
};
vendorSha256 = "sha256-021b+Jdk1VUGNSVNef89KLbWLdy4XhhEry4S2S0AhRg=";
vendorSha256 = "sha256-uGJ3D14qAvDkBUIlNxF1pCHMDYeuUoM8tPWfoEvA5o4=";
nativeBuildInputs = [ wire ];

51
packages/patched-inputs.nix
View file

@ -17,16 +17,47 @@
# hci-agent's build code does some funny shenanigans
hercules-ci-agent = let
original = packages.hercules-ci-agent.hercules-ci-agent;
patchedNix = patch-rename-direct original.nix ({ version, ...}: "nix-${version}_hci2") "patches/extra/hercules-ci-agent/nix";
in (original.override {
# for hercules-ci-cnix-expr, hercules-ci-cnix-store
nix = patchedNix;
# for cachix
pkgs = pkgs // { nix = patchedNix; };
}).overrideAttrs (old: {
# for hercules-ci-agent
buildInputs = (lib.remove original.nix old.buildInputs) ++ [ patchedNix ];
});
patchedNix = (patch original.nix "patches/extra/hercules-ci-agent/nix").overrideAttrs (old: rec {
name = "nix-${version}";
version = "${original.nix.version}_hci2";
postUnpack = ''
${old.postUnpack or ""}
echo -n "${version}" > .version
'';
});
forcePatchNix = old: {
buildInputs = (lib.remove original.nix old.buildInputs) ++ [ patchedNix ];
passthru = old.passthru // {
nix = patchedNix;
};
};
patchDeps = lib.const rec {
hercules-ci-cnix-store = packages.hercules-ci-agent.internal-hercules-ci-cnix-store.override (lib.const {
nix = patchedNix;
});
hercules-ci-cnix-expr = packages.hercules-ci-agent.internal-hercules-ci-cnix-expr.override (lib.const {
nix = patchedNix;
inherit hercules-ci-cnix-store;
});
cachix = (pkgs.haskellPackages.cachix.override (lib.const {
nix = patchedNix;
inherit hercules-ci-cnix-store;
})).overrideAttrs (o: {
postPatch = ''
${o.postPatch or ""}
# jailbreak pkgconfig deps
cp cachix.cabal cachix.cabal.backup
sed -i cachix.cabal -e 's/\(nix-[a-z]*\) *(==[0-9.]* *|| *>[0-9.]*) *&& *<[0-9.]*/\1/g'
sed -i cachix.cabal -e 's/pkgconfig-depends:.*/pkgconfig-depends: nix-main, nix-store/'
echo
echo Applied:
diff -U5 cachix.cabal.backup cachix.cabal ||:
echo
rm cachix.cabal.backup
'';
});
};
in (original.override patchDeps).overrideAttrs forcePatchNix;
hci = packages.hercules-ci-agent.hercules-ci-cli;
};

2
packages/servers/reflex-cache/project.nix
View file

@ -2,7 +2,7 @@
{
perSystem = { config, drv-backends, lib, pkgs, ... }: let
deps = with config.dependencySets.python3Packages; [
deps = with config.drv-parts.dependencySets.python3Packages; [
poetry-core
requests-unixsocket
py-multibase

28
packages/sources/sources.json
View file

@ -22,9 +22,9 @@
"repo": "excalidraw"
},
"branch": "master",
"revision": "d6a5ef19367c366ea9dc15d1f17569d829163828",
"url": "https://github.com/excalidraw/excalidraw/archive/d6a5ef19367c366ea9dc15d1f17569d829163828.tar.gz",
"hash": "01n34zv1dls7k9n8b2vhgjpc9qfmxw5z8vyjp0h8k5jbgjfv7izk"
"revision": "5ae39c9292bb69853b69a67ff1889380a651d6ca",
"url": "https://github.com/excalidraw/excalidraw/archive/5ae39c9292bb69853b69a67ff1889380a651d6ca.tar.gz",
"hash": "1h0frqzkvsk5p4x1g4yxfb460wj8bb699l7x4lhpb2rmd9qgxp90"
},
"searxng": {
"type": "Git",
@ -34,9 +34,9 @@
"repo": "searxng"
},
"branch": "master",
"revision": "13b0c251c45c3d14700723b25b601be56178e8df",
"url": "https://github.com/searxng/searxng/archive/13b0c251c45c3d14700723b25b601be56178e8df.tar.gz",
"hash": "0w46fw5vv3311xfgrzfpf5v00m5p27ck3gpz1jj29pnnm9alm93z"
"revision": "9d102fb08ff4a7dc04d093561adde60436e3f69e",
"url": "https://github.com/searxng/searxng/archive/9d102fb08ff4a7dc04d093561adde60436e3f69e.tar.gz",
"hash": "17ay25ipybs46khycsjgy1qf6q5127gn8v9vw7fv9p2drswmhzj0"
},
"stevenblack-hosts": {
"type": "GitRelease",
@ -47,10 +47,10 @@
},
"pre_releases": false,
"version_upper_bound": null,
"version": "3.11.52",
"revision": "5bd46272f4073e7c4b461bb1674e67a641b3c48e",
"url": "https://api.github.com/repos/StevenBlack/hosts/tarball/3.11.52",
"hash": "07zg9ff6m4zvwvnf37hwxz6iklnmh5k5d9b4gc1bma7wcf5hlikn"
"version": "3.12.1",
"revision": "a5b36aac7afc39d46af5324769fab5cbfc1c5bab",
"url": "https://api.github.com/repos/StevenBlack/hosts/tarball/3.12.1",
"hash": "09wrz3ydlw0yx2pw18vn1dl8v7914h4nnjg0fna0lacc0wyhdmj3"
},
"tempo": {
"type": "GitRelease",
@ -75,10 +75,10 @@
},
"pre_releases": false,
"version_upper_bound": null,
"version": "1.19.4",
"revision": "5f5c2d7c469da6be1a1ac4208cbcfe35de9ae6d3",
"url": "https://api.github.com/repos/louislam/uptime-kuma/tarball/1.19.4",
"hash": "1n0vmy2m4hzgl50j5lzkziq2z8dbynvdcyyk5hm8cxy9vb7f2v0j"
"version": "1.19.6",
"revision": "2b57b3e863954c9d9cf7911b76f600bb8de4c41b",
"url": "https://api.github.com/repos/louislam/uptime-kuma/tarball/1.19.6",
"hash": "0kwljvnjd0wqxk6pjj66c82kc4wflc1cs8c2lz5cngsghmxjck8y"
}
},
"version": 2

1
packages/web-apps/searxng/default.nix
View file

@ -21,6 +21,7 @@ toPythonModule (buildPythonApplication rec {
VERSION_TAG="${pin.revision}"
GIT_URL="https://github.com/${repo.owner}/${repo.repo}"
GIT_BRANCH="${pin.branch}"
DOCKER_TAG="none"
EOF
'';