Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -15089,14 +15089,6 @@
|
||||
githubId = 88983487;
|
||||
name = "Loïc Reynier";
|
||||
};
|
||||
lom = {
|
||||
email = "legendofmiracles@protonmail.com";
|
||||
matrix = "@legendofmiracles:matrix.org";
|
||||
github = "legendofmiracles";
|
||||
githubId = 30902201;
|
||||
name = "legendofmiracles";
|
||||
keys = [ { fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; } ];
|
||||
};
|
||||
lomenzel = {
|
||||
name = "Leonard-Orlando Menzel";
|
||||
email = "leonard.menzel@tutanota.com";
|
||||
@@ -23197,12 +23189,6 @@
|
||||
github = "SandaruKasa";
|
||||
githubId = 50824690;
|
||||
};
|
||||
sander = {
|
||||
email = "s.vanderburg@tudelft.nl";
|
||||
github = "svanderburg";
|
||||
githubId = 1153271;
|
||||
name = "Sander van der Burg";
|
||||
};
|
||||
sandptel = {
|
||||
email = "sandppatel15@gmail.com";
|
||||
github = "sandptel";
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) maintainers;
|
||||
inherit (lib.meta) getExe;
|
||||
inherit (lib.modules) mkIf mkMerge;
|
||||
inherit (lib.options)
|
||||
@@ -205,6 +204,7 @@ in
|
||||
|
||||
systemd.services.scrutiny = {
|
||||
description = "Hard Drive S.M.A.R.T Monitoring, Historical Trends & Real World Failure Thresholds";
|
||||
enableStrictShellChecks = true;
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ] ++ lib.optional cfg.influxdb.enable "influxdb2.service";
|
||||
wants = lib.optional cfg.influxdb.enable "influxdb2.service";
|
||||
@@ -217,7 +217,7 @@ in
|
||||
${genJqSecretsReplacementSnippet cfg.settings "/run/scrutiny/config.yaml"}
|
||||
'';
|
||||
postStart = ''
|
||||
for i in $(seq 300); do
|
||||
for _ in $(seq 300); do
|
||||
if "${lib.getExe pkgs.curl}" --fail --silent --head "http://${cfg.settings.web.listen.host}:${toString cfg.settings.web.listen.port}" >/dev/null; then
|
||||
echo "Scrutiny is ready (port is open)"
|
||||
exit 0
|
||||
@@ -251,6 +251,7 @@ in
|
||||
systemd = {
|
||||
services.scrutiny-collector = {
|
||||
description = "Scrutiny Collector Service";
|
||||
enableStrictShellChecks = true;
|
||||
after = lib.optional cfg.enable "scrutiny.service";
|
||||
wants = lib.optional cfg.enable "scrutiny.service";
|
||||
environment = {
|
||||
|
||||
@@ -54,6 +54,15 @@ in
|
||||
example = {
|
||||
serverAddr = "x.x.x.x";
|
||||
serverPort = 7000;
|
||||
proxies = [
|
||||
{
|
||||
name = "ssh";
|
||||
type = "tcp";
|
||||
localIP = "127.0.0.1";
|
||||
localPort = 22;
|
||||
remotePort = 6000;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
+2
-2
@@ -33,8 +33,8 @@ let
|
||||
in
|
||||
{
|
||||
name = "xxh";
|
||||
meta = with lib.maintainers; {
|
||||
maintainers = [ lom ];
|
||||
meta = {
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
||||
@@ -16,24 +16,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "focuswriter";
|
||||
version = "1.8.11";
|
||||
version = "1.8.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gottcode";
|
||||
repo = "focuswriter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oivhrDF3HikbEtS1cOlHwmQYNYf3IkX+gQGW0V55IWU=";
|
||||
hash = "sha256-lKhgfFPEcipQcW1S2+ntglVacH6dEcGpnNHvwgeVIzI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build, remove at next version bump
|
||||
# https://github.com/gottcode/focuswriter/pull/208
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gottcode/focuswriter/commit/dd74ed4559a141653a06e7984c1251b992925775.diff";
|
||||
hash = "sha256-1bxa91xnkF1MIQlA8JgwPHW/A80ThbVVdVtusmzd22I=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
|
||||
@@ -87,7 +87,6 @@ stdenv.mkDerivation {
|
||||
meta = {
|
||||
description = "Super Nintendo Entertainment System Emulator";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
homepage = "https://www.zsnes.com";
|
||||
platforms = [
|
||||
"i686-linux"
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
{
|
||||
traefik-crd = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-27.0.201+up27.0.2.tgz";
|
||||
sha256 = "0vwprcb60y15sc4lmi58gl1zr3yhsq43jlbsfm7gs20ci90frv16";
|
||||
};
|
||||
traefik = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-27.0.201+up27.0.2.tgz";
|
||||
sha256 = "12dp1r82qfzqfzs4sfxc54rnw8kv42a3w4gpk5v3qkhqm6fkrnn1";
|
||||
};
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
{
|
||||
"airgap-images-amd64-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
|
||||
"sha256": "d6a0e04f107d223795869aa839b1e504716c4d90f40411cc158bd565c4bef171"
|
||||
},
|
||||
"airgap-images-amd64-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
|
||||
"sha256": "616b23148d7f81128861aa3793e972ffc8419f7f674eab6b248bd9e33d805696"
|
||||
},
|
||||
"airgap-images-arm-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-arm.tar.gz",
|
||||
"sha256": "46519a25426c7db9ca8828fa518c7918d26c1088b48d5b309fd77e81a73e500d"
|
||||
},
|
||||
"airgap-images-arm-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-arm.tar.zst",
|
||||
"sha256": "082c8b305b73b1a678c1d6549b77eae1d44b2f954d07d76acf9c13181a0b0718"
|
||||
},
|
||||
"airgap-images-arm64-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
|
||||
"sha256": "8ff705955f8c199b92a35554ed3c154c37920a5c6e6a46a9c18f884b979ea391"
|
||||
},
|
||||
"airgap-images-arm64-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.14%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
|
||||
"sha256": "b0968e1bf34d1109572e3795bae315ae7609be69b1c1f87dc0d6fce072790fe7"
|
||||
}
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
{
|
||||
k3sVersion = "1.31.14+k3s1";
|
||||
k3sCommit = "a2ef79f53538e58982857c1820469792d582e470";
|
||||
k3sRepoSha256 = "0rww4z63vf13g3rssqfmp9444bs1mzb1y6wddysqfxj8fm3kakwl";
|
||||
k3sVendorHash = "sha256-FBNHUk04m8El4oTyJMznv8eyT8DSt5Q3ypqL9qT/WDU=";
|
||||
chartVersions = import ./chart-versions.nix;
|
||||
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
|
||||
k3sRootVersion = "0.15.0";
|
||||
k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
|
||||
k3sCNIVersion = "1.8.0-k3s1";
|
||||
k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg";
|
||||
containerdVersion = "2.1.5-k3s1.32";
|
||||
containerdSha256 = "1fzld9q0ycfg9b3054qg70mif1p6i7xqikcbabrmxapk81fy83kn";
|
||||
criCtlVersion = "1.31.0-k3s2";
|
||||
}
|
||||
@@ -12,16 +12,6 @@ let
|
||||
extraArgs = removeAttrs args [ "callPackage" ];
|
||||
in
|
||||
{
|
||||
k3s_1_31 = common (
|
||||
(import ./1_31/versions.nix)
|
||||
// {
|
||||
updateScript = [
|
||||
./update-script.sh
|
||||
"31"
|
||||
];
|
||||
}
|
||||
) extraArgs;
|
||||
|
||||
k3s_1_32 = common (
|
||||
(import ./1_32/versions.nix)
|
||||
// {
|
||||
|
||||
@@ -1,138 +0,0 @@
|
||||
{
|
||||
"images-calico-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "bb3f3801eaf707df00572fd75138c40516abb1d8ebb2dc050861e0e86fcdb21a"
|
||||
},
|
||||
"images-calico-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "91c03b11730f9027e133ac3fd0e660a1c277f7874ec195c014ec70060bc8c940"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "729c658fb71c9cb4137735ba34f864a0fe9e27a73e051549a00287574b6b5982"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "672727e889c990afa97974f2a0fc508f7c0f22d6fb80c30f6568720b6f7991ce"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "9de9e9b8cd86b1b568ce454c88c3f6ab809c40306521a78e6f06973e5e9c35e0"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "e040e9b1c5b7dfa83eb1feffa6bda5befd0bbcb530246b9205b07dd49bae3165"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "3e2e8078d36c841e4316ab36b6933d2113783d0bcb546728a796f9571cd8e408"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "6bcfb2ca82625bf040ca32a2277f34ecb3d6a544acc9536e450d4fd0986fce3f"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "6f7207120d47a24582cbe2b18d9ec4f825843d6a2bcdef123de4bd1f8a8a9a36"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "6b75de7bb9ed96a6586d70754d146fd4d0d2e2ebd70d91ec84da43cfd69c47ee"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "6096fcf06633938d5c5d27458977760306d3d186c7ba00ec19f2aafd5876488c"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "b5095272ed499a3afdf243ccb36d982be702b7131f2241905cb60c73f4842a1d"
|
||||
},
|
||||
"images-core-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "e82c0cf1f6f1cb8722b8c68ca3cbbf11f84ce3e3826621643fd40d1fd249d2ff"
|
||||
},
|
||||
"images-core-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "aece7dc2fe3d1965ff593c6a718c037bf4b465145ae9df625391c1a7eb352f98"
|
||||
},
|
||||
"images-core-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "f096d5e248d41a5e6ed9a06fb1d661ed82826c63cbed7d7402d77779d4431a90"
|
||||
},
|
||||
"images-core-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "ad07b9f80f27564f4b26b62621a77bc5623588b1acf2e9eabec1bfaf0434400b"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "a28a27426c234c0f2b45ff47b7d74a0b24923f53965c65fc17f703b99c4d58a8"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "b67b55c5d66f990c41478bff28ccfc1ea1aa67d750fcef778b383ce87361c9f4"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "a0893b10b85bd5dbbd5693df6ffecc40bfaf88e247e47f5ffeb203a5ef3ef372"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "2091e9badbc1955b2c5b31976137a72c863730b8dbffb83a45a0d5f11f6773d9"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "232fea1650044b968a3f60798795e8d13f6b6c783ea95f8fd4c29f4c708f1867"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "f827e615c5411e1fef08e56c82055646c0375ab2d4432b9362fe90baf9e6bff1"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "f3e478ace2af1207be5f05b0eda496534456b8d6e4cd2fcca1163d4ea0df5727"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "22a6d20f0fd1ba4060b42899747b52527bdfcd410b9dd8d0d40e121caf4eb5e5"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "2904bb319a2a9b50566a12a6f7c4c3c11aee4b319510f15da51965bdef3f0de8"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "b01d3898c8bf13b3357b2afcb6870e2b4d86aafc17c07160e27c5c5555d97cae"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "c2167ff4eae80bef4073c8e5ae6a1c711bfe1dc423361bc18a6d79e40133965d"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "f1d2675a78ddaf1b2460597eb073816b09d5f7793e58aec3b60e37e889a81237"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "1e171a926929c663098f9f2bce5979d5b509b6408a844a925b1357da6ff1f0c0"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "fcd70d9b9c0adefd23ec53e6fa805067ed401909967d11c4cc15d84090c55768"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "3de32e76b4291e7341db4d38f78afbacc1a94346a46462db309ea6b6b7f7b199"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "454e68db0a4cdac415fa42eb0ab51601b9877038733530493d9e77657ce590e4"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "6538ef3e4dc067deccd6ad97cf8fe0a61ca43163611fef99be0359beeb6fca66"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "74eab5ac15780caa1f3edebfa7781efc0245a2b4dacbc001c2d849b608b813f7"
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
{
|
||||
rke2Version = "1.31.14+rke2r1";
|
||||
rke2Commit = "a594ea8cf80ad7b2b55f1b0286b34c8af7d53c30";
|
||||
rke2TarballHash = "sha256-1IQdJPF546DX7eHPoA0rIfUJs3uZSTDXfn5OnJbU7FQ=";
|
||||
rke2VendorHash = "sha256-HmJyX7QsuB5g0bajgExMi2rg9jTTTUZiuYXlrfNA5xo=";
|
||||
k8sImageTag = "v1.31.14-rke2r1-build20251112";
|
||||
etcdVersion = "v3.5.21-k3s1-build20251017";
|
||||
pauseVersion = "3.6";
|
||||
ccmVersion = "v1.31.14-0.20251010190929-c49b201b7cf5-build20251017";
|
||||
dockerizedVersion = "v1.31.14-rke2r1";
|
||||
imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
|
||||
}
|
||||
@@ -5,16 +5,6 @@ let
|
||||
extraArgs = removeAttrs args [ "callPackage" ];
|
||||
in
|
||||
rec {
|
||||
rke2_1_31 = common (
|
||||
(import ./1_31/versions.nix)
|
||||
// {
|
||||
updateScript = [
|
||||
./update-script.sh
|
||||
"31"
|
||||
];
|
||||
}
|
||||
) extraArgs;
|
||||
|
||||
rke2_1_32 = common (
|
||||
(import ./1_32/versions.nix)
|
||||
// {
|
||||
|
||||
@@ -30,17 +30,17 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mullvad";
|
||||
version = "2025.13";
|
||||
version = "2025.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mullvad";
|
||||
repo = "mullvadvpn-app";
|
||||
tag = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-YDHO7NpZU5rxjCMpdKvpYcy0l8AEtiSN+fP2Ii8JXDQ=";
|
||||
hash = "sha256-9HPOhhtbo7BocycuO7IgjyfWHXBh/5YQDNJ/VwKnKG0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XaVgQRJcIqeKgwxlJSrW6WI7GC02lX3NtTJOGo4irzg=";
|
||||
cargoHash = "sha256-PzUVwx72qkUDKCZ8hfpVT0bqnuakaitPedInn/EfW3o=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p mullvad-daemon --bin mullvad-daemon"
|
||||
|
||||
@@ -43,6 +43,6 @@ buildLua {
|
||||
description = "Cut videos and concat them automatically";
|
||||
homepage = "https://github.com/rushmj/mpv-video-cutter";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lom ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,21 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-compose";
|
||||
version = "2.39.4";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "compose";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NDNyXK4E7TkviESHLp8M+OI56ME0Hatoi9eWjX+G1zo=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7g9l9SBxPY3jMS3DWZNI/fhOZN1oZo1qkUfhMfbzAaM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# entirely separate package that breaks the build
|
||||
rm -rf pkg/e2e/
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-Uqzul9BiXHAJ1BxlOtRS68Tg71SDva6kg3tv7c6ar2E=";
|
||||
vendorHash = "sha256-COfB0MLBMOfTdLbpShBkMOEule/1cu6Bo5lm1ieO/nA=";
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/docker/compose/v2/internal.Version=${version}"
|
||||
|
||||
@@ -419,7 +419,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl3Only;
|
||||
homepage = "https://www.virtualbox.org/";
|
||||
maintainers = with lib.maintainers; [
|
||||
sander
|
||||
friedrichaltheide
|
||||
blitz
|
||||
];
|
||||
|
||||
@@ -24,7 +24,6 @@ fetchurl rec {
|
||||
license = licenses.virtualbox-puel;
|
||||
homepage = "https://www.virtualbox.org/";
|
||||
maintainers = with maintainers; [
|
||||
sander
|
||||
friedrichaltheide
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
||||
@@ -14,7 +14,6 @@ fetchurl {
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [
|
||||
lib.maintainers.sander
|
||||
lib.maintainers.friedrichaltheide
|
||||
];
|
||||
platforms = [
|
||||
|
||||
@@ -171,7 +171,6 @@ stdenv.mkDerivation {
|
||||
sourceProvenance = with lib.sourceTypes; [ fromSource ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [
|
||||
lib.maintainers.sander
|
||||
lib.maintainers.friedrichaltheide
|
||||
];
|
||||
platforms = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "adminneo";
|
||||
version = "5.2.0";
|
||||
version = "5.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adminneo-org";
|
||||
repo = "adminneo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-x92APmqRbH9XxMJjQASwHAgD0SWTK63MMYwkbiEq7U8=";
|
||||
hash = "sha256-NCQqjIJsAiz1At/oYsuuUejr5A7PVLyzROI5Ev3zxlM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -61,7 +61,6 @@ gccStdenv.mkDerivation (finalAttrs: {
|
||||
provided by ARJ Software, Inc.
|
||||
'';
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bento";
|
||||
version = "1.13.0";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "warpstreamlabs";
|
||||
repo = "bento";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fPlzCJ+Wxek6aJhwJcO2OWvDXRO6jbbJ7/4YIfQ3SMA=";
|
||||
hash = "sha256-5UzicbR+JzLgPLilPHO9HKteC632cJc5EQanPPc0lj8=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-shear";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "cargo-shear";
|
||||
version = finalAttrs.version;
|
||||
hash = "sha256-GvkIXk0Ry3bm5A+PwdH4zrDtxzfJt4pd8gF/PPGsyDs=";
|
||||
hash = "sha256-hZrqEbBcSSmvMRBn1V1L5Ow/drN1lAO5owu2reXrruA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3PIdxoLoe9cgjr53lu7X1cGNT9wHgIG0E4jld7TK3b4=";
|
||||
cargoHash = "sha256-UD0J6fofx24gqHVF/1X3RDChOSGpqfQ+37KZprZ8cIM=";
|
||||
|
||||
env = {
|
||||
# https://github.com/Boshen/cargo-shear/blob/v1.6.2/src/lib.rs#L51-L54
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/willeccles/cfm";
|
||||
description = "Simple and fast TUI file manager with no dependencies";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ lom ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "cfm";
|
||||
};
|
||||
|
||||
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/conradludgate/wordle";
|
||||
# repo has no license, but crates.io says it's MIT
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lom ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "wordle";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage {
|
||||
description = "Simple command-line tool to send text and files to discord";
|
||||
homepage = "https://github.com/somebody1234/cliscord";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ lom ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "cliscord";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "cloudsmith-cli";
|
||||
version = "1.8.3";
|
||||
version = "1.8.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudsmith-io";
|
||||
repo = "cloudsmith-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-PYqOj6nHjJrG7Ndc5vm//E8mjk4xZFVQopFqiWtH5ZQ=";
|
||||
hash = "sha256-xUaa1B6f6W0Q/9q8sztFoCxEaxqXajImROC1sJb0Zdk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -60,6 +60,10 @@ python3Packages.buildPythonApplication rec {
|
||||
cd "$out"
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
"TestMainCommand"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://help.cloudsmith.io/docs/cli/";
|
||||
description = "Cloudsmith Command Line Interface";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cri-tools";
|
||||
version = "1.34.0";
|
||||
version = "1.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cri-tools";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nWbxPw8lz1FYLHXJ2G4kzOl5nBPXSl4nEJ9KgzS/wmA=";
|
||||
hash = "sha256-66UDoObxlNBTYJPpo4GoQlV66hXZRf5eLB3ji0KU/Zs=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cubeb";
|
||||
version = "0-unstable-2025-09-17";
|
||||
version = "0-unstable-2025-12-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "cubeb";
|
||||
rev = "e495bee4cd630c9f99907a764e16edba37a4b564";
|
||||
hash = "sha256-iBxYZppjJhFAwGi9v4/lTsyqC9Gy04Dc7bJNzgv18rE=";
|
||||
rev = "bed368eb0d901ec4b7921a8d704ca469b7fb4e19";
|
||||
hash = "sha256-Y9qSqU8BsAcD+uBmAvKYzlZFJ7LZAdbtSt1Lc59iOG0=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
|
||||
Java).
|
||||
'';
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.sander ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "daemon";
|
||||
};
|
||||
|
||||
@@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.sander ];
|
||||
license = licenses.afl21;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -130,7 +130,6 @@ stdenv.mkDerivation rec {
|
||||
cc-by-sa-30
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
lom
|
||||
ncfavier
|
||||
Scrumplex
|
||||
sirseruju
|
||||
|
||||
@@ -72,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/svanderburg/DisnixWebService";
|
||||
changelog = "https://github.com/svanderburg/DisnixWebService/blob/${finalAttrs.src.rev}/NEWS.txt";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "diskus";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkdp";
|
||||
repo = "diskus";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-88+U5Y2CC0PhikRO3VqoUwZEYZjwln+61OPWbLLb8T0=";
|
||||
sha256 = "sha256-z0w2wzlbF7mY8kr6N//Rsm8G5P1jhrEwoOJ7MYrbKIE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-keBnhE4ltOVMEuxPifiB2EAHk32u3PqaPGTeVexVXWM=";
|
||||
cargoHash = "sha256-PngglR3BNktjnb8hdd3A6iKu/Q0OCCj9aTxyWBuy6a0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Minimal, fast alternative to 'du -sh'";
|
||||
|
||||
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Provides complementary NixOS infrastructure deployment to Disnix";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
let
|
||||
self = python3.pkgs.buildPythonApplication rec {
|
||||
pname = "duplicity";
|
||||
version = "3.0.6.2";
|
||||
version = "3.0.6.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "duplicity";
|
||||
repo = "duplicity";
|
||||
rev = "rel.${version}";
|
||||
hash = "sha256-S0bfE7ddfUsqhobbldu8RSVsOKHtq2ijL/PgDB5e+sw=";
|
||||
hash = "sha256-WY2pQlWlqdsFGONUBdAoJM1sNr+Hu496pThhn8IKSXE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -84,6 +84,7 @@ let
|
||||
pygobject3
|
||||
fasteners
|
||||
paramiko
|
||||
pexpect
|
||||
# Currently marked as broken.
|
||||
# pydrive2
|
||||
]
|
||||
|
||||
@@ -99,7 +99,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [
|
||||
jayman2000
|
||||
sander
|
||||
];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@@ -184,7 +184,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = with lib.licenses; [ gpl2Plus ];
|
||||
maintainers = with lib.maintainers; [
|
||||
qubitnano
|
||||
sander
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
@@ -52,7 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
sander
|
||||
raskin
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
|
||||
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [
|
||||
sander
|
||||
raskin
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
|
||||
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [
|
||||
sander
|
||||
raskin
|
||||
pbsds
|
||||
];
|
||||
|
||||
@@ -221,7 +221,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://www.ejabberd.im";
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
sander
|
||||
chuangzhu
|
||||
toastal
|
||||
];
|
||||
|
||||
@@ -71,7 +71,6 @@ rustPlatform.buildRustPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
coffeeispower
|
||||
lom
|
||||
w-lfchen
|
||||
];
|
||||
mainProgram = "eww";
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fetchmail";
|
||||
version = "6.6.1";
|
||||
version = "6.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
|
||||
hash = "sha256-ONAf5ATmdRTfOUpu0agVu7YaqQwPpEAiUlk6ztDjih0=";
|
||||
hash = "sha256-pRCSlewzGeDkXt0AnS2XcEKoMmq1LGqBeoL6mHED5PM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -55,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
homepage = "http://freetts.sourceforge.net";
|
||||
license = lib.licenses.bsdOriginal;
|
||||
maintainers = with lib.maintainers; [ sander ];
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode # jsapi.jar is bundled in a self-extracting shell-script
|
||||
|
||||
@@ -56,9 +56,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Graphical front-end for the FS-UAE emulator";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "fs-uae-launcher";
|
||||
maintainers = with lib.maintainers; [
|
||||
sander
|
||||
];
|
||||
platforms = with lib.systems.inspect; patternLogicalAnd patterns.isx86 patterns.isLinux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "GeoIP Java API";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
homepage = "https://github.com/phisch/giph";
|
||||
description = "Simple gif recorder";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.lom ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "giph";
|
||||
};
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
libGL,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hyprlax";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sandwichfarm";
|
||||
repo = "hyprlax";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RIeMsQt6MxSTI7TunIxk7wd08sYmr3EvjAQifr+M4e8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
wayland
|
||||
wayland-protocols
|
||||
libGL
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Dynamic parallax wallpaper engine with multi-compositor support for Linux";
|
||||
longDescription = ''
|
||||
hyprlax is a GPU-accelerated Wayland wallpaper daemon with parallax effects.
|
||||
|
||||
Features:
|
||||
- Buttery smooth GPU-accelerated animations with configurable FPS
|
||||
- Multi-layer parallax with depth-of-field blur effects
|
||||
- Multi-compositor support (Hyprland, Sway, River, Niri, generic Wayland)
|
||||
- Customizable per-layer easing functions, delays, and animation parameters
|
||||
- Dynamic layer management via IPC (add, remove, modify layers at runtime)
|
||||
- Lightweight native client using compositor-specific protocols
|
||||
- Seamless animation interrupts and chaining
|
||||
'';
|
||||
homepage = "https://github.com/sandwichfarm/hyprlax";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers._6543 ];
|
||||
mainProgram = "hyprlax";
|
||||
};
|
||||
}
|
||||
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Open Source J2EE application server";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.lgpl21;
|
||||
maintainers = [ maintainers.sander ];
|
||||
platforms = platforms.unix;
|
||||
knownVulnerabilities = [
|
||||
"CVE-2015-7501: remote code execution in apache-commons-collections: InvokerTransformer during deserialisation"
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "kas";
|
||||
version = "5.0";
|
||||
version = "5.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siemens";
|
||||
repo = "kas";
|
||||
tag = version;
|
||||
hash = "sha256-KSmLQBOYyuO9o3YZYPJPDPeGudtNYIC2yghAu98sf3Q=";
|
||||
hash = "sha256-SQeoRm2bjcQmhfMUJCSxgKu7/qcIEv9ItWcLWkkNwAs=";
|
||||
};
|
||||
|
||||
patches = [ ./pass-terminfo-env.patch ];
|
||||
|
||||
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
description = "Qmk keymap.c visualizer";
|
||||
homepage = "https://github.com/yskoht/keymapviz";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lom ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "keymapviz";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://www.krusader.org";
|
||||
description = "Norton/Total Commander clone for KDE";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ sander ];
|
||||
mainProgram = "krusader";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -23,7 +23,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://github.com/jca02266/lha";
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
sander
|
||||
momeemt
|
||||
];
|
||||
# Some of the original LHa code has been rewritten and the current author
|
||||
|
||||
@@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = licenses.isc;
|
||||
homepage = "http://fragglet.github.io/lhasa";
|
||||
maintainers = [ maintainers.sander ];
|
||||
mainProgram = "lha";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.sander ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -58,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sourceProvenance = [ lib.sourceTypes.fromSource ];
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [
|
||||
lib.maintainers.sander
|
||||
lib.maintainers.emily
|
||||
];
|
||||
mainProgram = "resample-sndfile";
|
||||
|
||||
@@ -61,7 +61,6 @@ stdenv.mkDerivation rec {
|
||||
description = "SSH client library";
|
||||
homepage = "https://libssh.org";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ sander ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -73,13 +73,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "6981";
|
||||
version = "7342";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-0WtiHDlMeb+m2XcMwkPFY1mtwVTwRJUoxQSwzpiRbts=";
|
||||
hash = "sha256-x/Eq27wxEBSkcJnJXY8hQ7uL3zFVnAvMKvdoYh2AtPY=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
||||
@@ -101,7 +101,6 @@ stdenv.mkDerivation rec {
|
||||
downloadPage = "https://ftp.osuosl.org/pub/midnightcommander/";
|
||||
homepage = "https://midnight-commander.org";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ sander ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
mainProgram = "mc";
|
||||
};
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mediawiki";
|
||||
version = "1.44.2";
|
||||
version = "1.45.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz";
|
||||
hash = "sha256-59cCZpeWcfr9A3BeF6IfGFvRsoP/hD7XL+KQ6G+sQzE=";
|
||||
hash = "sha256-1Jm8frPXGDXCvsHJyu2IoDCK7DfwcmTnURDSor7wJTQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -56,7 +56,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Nintendo 64 Emulator";
|
||||
license = licenses.gpl2Plus;
|
||||
homepage = "http://www.mupen64plus.org/";
|
||||
maintainers = [ maintainers.sander ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "mupen64plus";
|
||||
};
|
||||
|
||||
@@ -91,7 +91,6 @@ stdenv.mkDerivation {
|
||||
binaryNativeCode
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
sander
|
||||
rszibele
|
||||
kashw2
|
||||
];
|
||||
|
||||
@@ -47,7 +47,6 @@ buildGoModule rec {
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [
|
||||
panaeon
|
||||
lom
|
||||
];
|
||||
mainProgram = "noisetorch";
|
||||
};
|
||||
|
||||
@@ -51,6 +51,5 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://spiro.trikaliotis.net/opencbm";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.sander ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
version = "9.1.5";
|
||||
version = "10.0.0";
|
||||
pname = "oxipng";
|
||||
|
||||
# do not use fetchCrate (only repository includes tests)
|
||||
@@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "shssoichiro";
|
||||
repo = "oxipng";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-UjiGQSLiUMuYm62wF7Xwhp2MRzCaQ9pbBBkvHnuspVw=";
|
||||
hash = "sha256-c8NNTO+6GuFb5BBPpdyDSHbtmojq+9ceOic54Zq3nwE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-sdhyxJDUlb6+SJ/kvfqsplHOeCEbA3ls66eur3eeVVA=";
|
||||
cargoHash = "sha256-YStZ2j2gjC5uVUnHaQIk6xtSbnPm0IoNONRr/nFOOUg=";
|
||||
|
||||
# don't require qemu for aarch64-linux tests
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "par-lang";
|
||||
version = "0-unstable-2025-12-02";
|
||||
version = "0-unstable-2025-12-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "faiface";
|
||||
repo = "par-lang";
|
||||
rev = "aa01ca58034b91f64b3ad5c849bb0e97762221af";
|
||||
hash = "sha256-W68fareSkbnHnFy0IFIShOebC0cCcWqRWoaez3drsYI=";
|
||||
rev = "9056718048a5c8d1ff32c60f9fc5db5af36a0259";
|
||||
hash = "sha256-uerYlhUqwpt3BbYiN6+CubhZAcMRXTFKqKSqyqh5WYY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-sW+gAIp/DjlTo44QDXpP6COrCK/CcDlx3no284MEQJo=";
|
||||
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
|
||||
description = "Minimal screenshot annotation tool with lua config";
|
||||
homepage = "https://github.com/Nooo37/pinsel";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lom ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "pinsel";
|
||||
};
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "plasma-panel-colorizer";
|
||||
version = "5.6.0";
|
||||
version = "5.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luisbocanegra";
|
||||
repo = "plasma-panel-colorizer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7Bh3Dn7hnPlaPSDxrdZKCQRfMsfiT3pwS6TGt8CyLDk=";
|
||||
hash = "sha256-Bx4TS6j5smI4SbkxJK7oiLIu72ClArUcZSB+MKf0kfM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -73,7 +73,6 @@ stdenv.mkDerivation {
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
homepage = "http://advsys.net/ken/utils.htm";
|
||||
platforms = lib.attrNames platforms;
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
mainProgram = "pngout";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
extraPackages ? [ ],
|
||||
crun,
|
||||
runc,
|
||||
krunkit,
|
||||
conmon,
|
||||
extraRuntimes ? lib.optionals stdenv.hostPlatform.isLinux [ runc ], # e.g.: runc, gvisor, youki
|
||||
fuse-overlayfs,
|
||||
@@ -165,9 +166,8 @@ buildGoModule (finalAttrs: {
|
||||
iproute2
|
||||
nftables
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
vfkit
|
||||
]
|
||||
++ lib.optional (lib.meta.availableOn stdenv.hostPlatform vfkit) vfkit
|
||||
++ lib.optional (lib.meta.availableOn stdenv.hostPlatform krunkit) krunkit
|
||||
++ extraPackages
|
||||
);
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ python3Packages.buildPythonPackage rec {
|
||||
description = "Terminal-based presentation tool with colors and effects";
|
||||
homepage = "https://github.com/vinayak-mehta/present";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lom ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "present";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "qui";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "autobrr";
|
||||
repo = "qui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-M2ufnazZ2/1RLDbsFWs5pikw5Os+flMS6swAjDmGoFE=";
|
||||
hash = "sha256-PcJl9nxHPWv17AqtEok0qHhrTQ1WInUKAtxrxoSeMSw=";
|
||||
};
|
||||
|
||||
qui-web = stdenvNoCC.mkDerivation (finalAttrs': {
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "repomix";
|
||||
version = "1.8.0";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yamadashy";
|
||||
repo = "repomix";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-o7C6Y9GDeodKViuo6gd5GbYH1isgLDoiyqmMvyo8rUM=";
|
||||
hash = "sha256-UZvVXSucx/OrCRFT/esOHjC/XOAxN8buoyGShh8HdYM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-S9s1SeqW9vcpz9XTLRjYH9ChNngg9h3HkWz8Nmxaygs=";
|
||||
npmDepsHash = "sha256-cXD1rs5wLCJdBLPkZiNtDj/EaAc46gbdSmCo6FajcUo=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -75,7 +75,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "rott";
|
||||
homepage = "https://icculus.org/rott/";
|
||||
license = with lib.licenses; [ gpl2Plus ] ++ lib.optional withSharewareData unfreeRedistributable;
|
||||
maintainers = with lib.maintainers; [ sander ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
|
||||
mainProgram = "rpg-cli";
|
||||
homepage = "https://github.com/facundoolano/rpg-cli";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lom ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rtorrent";
|
||||
version = "0.16.4";
|
||||
version = "0.16.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rakshasa";
|
||||
repo = "rtorrent";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ut1R73UfkpDk/Y5Fq8kSavxIB3Y2jbYEQ8J/559Ech0=";
|
||||
hash = "sha256-zncal17A4/+WGU3L8iJVSMJtKTKNmMHCXJ2O7Za2VOE=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -47,6 +47,8 @@ stdenv.mkDerivation {
|
||||
$out/bin/${baseName} --version | grep -q "${version}"
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "Opinionated code formatter for Scala";
|
||||
homepage = "http://scalameta.org/scalafmt";
|
||||
|
||||
Executable
+38
@@ -0,0 +1,38 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p curl jq gnused nix
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
latest_version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
|
||||
https://api.github.com/repos/scalameta/scalafmt/releases/latest | jq -r '.tag_name' | sed 's/^v//')
|
||||
|
||||
current_version=$(nix-instantiate --eval -A scalafmt.version | jq -r)
|
||||
|
||||
if [[ "$current_version" == "$latest_version" ]]; then
|
||||
echo "Already up to date, nothing to do."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "Updating scalafmt: $current_version -> $latest_version"
|
||||
|
||||
package_dir="$(dirname "${BASH_SOURCE[0]}")"
|
||||
package_nix="$package_dir/package.nix"
|
||||
|
||||
sed -i "s|version = \"$current_version\"|version = \"$latest_version\"|" "$package_nix"
|
||||
|
||||
build_output=$(nix-build -A scalafmt 2>&1) || true
|
||||
|
||||
if echo "$build_output" | grep -q "hash mismatch"; then
|
||||
new_deps_hash=$(echo "$build_output" | grep "got:" | sed -n 's/.*got:[[:space:]]*\(sha256-[A-Za-z0-9+/=]*\).*/\1/p' | head -1)
|
||||
if [[ -n "$new_deps_hash" ]]; then
|
||||
sed -i "s|outputHash = \"sha256-[A-Za-z0-9+/=]*\"|outputHash = \"$new_deps_hash\"|" "$package_nix"
|
||||
else
|
||||
echo "Could not extract new hash from build output, build output:"
|
||||
echo "$build_output"
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "Unexpected: Build succeeded without hash mismatch, build output:"
|
||||
echo "$build_output"
|
||||
exit 1
|
||||
fi
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sdl3-shadercross";
|
||||
version = "0-unstable-2025-09-18";
|
||||
version = "0-unstable-2025-12-06";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsdl-org";
|
||||
repo = "SDL_shadercross";
|
||||
rev = "3e572c3219ea438bff849cebea34f3aad7e1859b";
|
||||
hash = "sha256-2kpW4AN5eYPY3GxxDpH++nVHtBhSVv5FM2X4I+F2iAU=";
|
||||
rev = "f1ca8cfefba8f32095861bbcf2a4f4d773f0fbb4";
|
||||
hash = "sha256-q0iEoN8+f438ScgAvobDh7evulfaZ3Cd8zkc19kRT54=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/dmadisetti/steam-tui";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
lom
|
||||
dmadisetti
|
||||
];
|
||||
# steam only supports that platform
|
||||
|
||||
@@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
homepage = "https://github.com/sdushantha/tmpmail";
|
||||
description = "Temporary email right from your terminal written in POSIX sh";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.lom ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "tmpmail";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "uv";
|
||||
version = "0.9.16";
|
||||
version = "0.9.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-8O/3RR82ZNclJ4X8GuFM9T0F0WaQ17EXbRO1S5finUU=";
|
||||
hash = "sha256-DY/D2t1O2vsFisc3FR97A9oNic9wjxVnYWiAqQR3FwI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-5OK904pww2PQ6viRkXw/59Yow7ufBHLsWIYYQZOn/Is=";
|
||||
cargoHash = "sha256-cXr529d/PDLeFCwEo06vxfw9JkPjfhYB8MG2oqiGZUw=";
|
||||
|
||||
buildInputs = [
|
||||
rust-jemalloc-sys
|
||||
|
||||
@@ -87,7 +87,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Emulators for a variety of 8-bit Commodore computers";
|
||||
homepage = "https://vice-emu.sourceforge.io/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "virtnbdbackup";
|
||||
version = "2.39";
|
||||
version = "2.40";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abbbi";
|
||||
repo = "virtnbdbackup";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YYmvWMWWMCNRWICHVSzRyae77YCSkrvh4mRJC0xpAbE=";
|
||||
hash = "sha256-F8AXawn8eVh6Foiv3Kx8vLJGTBM+WB4JIv78/s4UBPs=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -102,6 +102,6 @@ rustPlatform.buildRustPackage {
|
||||
mainProgram = "weylus";
|
||||
homepage = "https://github.com/H-M-H/Weylus";
|
||||
license = with licenses; [ agpl3Only ];
|
||||
maintainers = with maintainers; [ lom ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
|
||||
changelog = "https://github.com/Builditluc/wiki-tui/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
lom
|
||||
builditluc
|
||||
matthiasbeyer
|
||||
];
|
||||
|
||||
@@ -73,7 +73,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
homepage = "https://github.com/tarka/xcp";
|
||||
changelog = "https://github.com/tarka/xcp/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ lom ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "xcp";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -39,7 +39,7 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-7IdNFE9kWiwEB5hJhWeH7NElMGn7N68oYep7reXTJxw=";
|
||||
x86_64-linux = "sha256-osr7GeDZ3uIJq9k1aP8JKiyKeslYpZ8yOHSeaew47yQ=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
@@ -48,7 +48,7 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "xpipe";
|
||||
version = "19.4";
|
||||
version = "19.5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";
|
||||
|
||||
@@ -55,7 +55,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [
|
||||
lassulus
|
||||
sander
|
||||
];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@@ -15,7 +15,7 @@ bundlerApp {
|
||||
description = "REPL for x86-64 assembly language";
|
||||
homepage = "https://github.com/tenderlove/asmrepl";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lom ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.x86_64;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
{
|
||||
buildDunePackage,
|
||||
prometheus,
|
||||
asetmap,
|
||||
astring,
|
||||
cohttp-lwt,
|
||||
cohttp-lwt-unix,
|
||||
cmdliner,
|
||||
fmt,
|
||||
logs,
|
||||
lwt,
|
||||
re,
|
||||
alcotest,
|
||||
alcotest-lwt,
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "prometheus-app";
|
||||
inherit (prometheus)
|
||||
version
|
||||
src
|
||||
;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asetmap
|
||||
astring
|
||||
cmdliner
|
||||
cohttp-lwt
|
||||
cohttp-lwt-unix
|
||||
fmt
|
||||
logs
|
||||
lwt
|
||||
prometheus
|
||||
re
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkInputs = [
|
||||
alcotest
|
||||
alcotest-lwt
|
||||
];
|
||||
|
||||
meta = prometheus.meta // {
|
||||
description = "A web-server reporting prometheus metrics.";
|
||||
};
|
||||
}
|
||||
@@ -4,35 +4,31 @@
|
||||
buildDunePackage,
|
||||
astring,
|
||||
asetmap,
|
||||
fmt,
|
||||
re,
|
||||
lwt,
|
||||
alcotest,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "prometheus";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/prometheus/releases/download/v${version}/prometheus-${version}.tbz";
|
||||
sha256 = "sha256-g2Q6ApprbecdFANO7i6U/v8dCHVcSkHVg9wVMKtVW8s=";
|
||||
url = "https://github.com/mirage/prometheus/releases/download/v${finalAttrs.version}/prometheus-${finalAttrs.version}.tbz";
|
||||
hash = "sha256-4C0UzwaCgqtk5SGIY89rg0dxdrKm63lhdcOaQAa20L8=";
|
||||
};
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
astring
|
||||
asetmap
|
||||
fmt
|
||||
re
|
||||
lwt
|
||||
alcotest
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/mirage/prometheus";
|
||||
description = "Client library for Prometheus monitoring";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.ulrikstrid ];
|
||||
changelog = "https://raw.githubusercontent.com/mirage/prometheus/v${finalAttrs.version}/CHANGES.md";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudsmith-api";
|
||||
version = "2.0.21";
|
||||
version = "2.0.22";
|
||||
format = "wheel";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "cloudsmith_api";
|
||||
inherit format version;
|
||||
hash = "sha256-tReoNsSg90wReH/SVa2LAdy5q7DCnWJwnamisPkIuXs=";
|
||||
hash = "sha256-FZcDjrK5+oHC3dVBSXf+txW6hofP6OkmkjO4NJF05YQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -35,14 +35,14 @@
|
||||
|
||||
let
|
||||
pname = "psycopg";
|
||||
version = "3.3.1";
|
||||
version = "3.3.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psycopg";
|
||||
repo = "psycopg";
|
||||
tag = version;
|
||||
hash = "sha256-nNiiiMHAeaMJ+51RtjHeWRdOML4x05afZ/DBD3B1sM0=";
|
||||
hash = "sha256-ynzXQkTnCCkJK3EZrGHSpzgMeeX92U6+08m8QtNfAc4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -203,6 +203,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://riverbankcomputing.com/";
|
||||
license = licenses.gpl3Only;
|
||||
inherit (mesa.meta) platforms;
|
||||
maintainers = with maintainers; [ sander ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -26,6 +26,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/Python-SIP/sip";
|
||||
license = licenses.gpl3Only;
|
||||
inherit (mesa.meta) platforms;
|
||||
maintainers = with maintainers; [ sander ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -27,6 +27,6 @@ buildPythonPackage rec {
|
||||
description = "Python context manager for managing pid files";
|
||||
homepage = "https://github.com/mosquito/python-pidfile";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ lom ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,19 +16,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qcs-sdk-python";
|
||||
version = "0.21.21";
|
||||
version = "0.21.22";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rigetti";
|
||||
repo = "qcs-sdk-rust";
|
||||
tag = "python/v${version}";
|
||||
hash = "sha256-xSIkMz+wZvYtgjyW/6Nr4vn6oJZ3X38GNdXJfYchI8A=";
|
||||
hash = "sha256-uaoXSkc8yg+WZONgvRkOARaf9kvLKv6S+K5yMDuXbbA=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-U13R/U6/ugC7m0X2gTpjfOjgzRzTIk95mcMu2GtcNLM=";
|
||||
hash = "sha256-/SkYzQisSACTedC4FsEp4rXXdWV5f64gA33I/Ubu80E=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "crates/python";
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user