Compare commits

...

7 Commits

10 changed files with 33 additions and 25 deletions

View File

@@ -22,7 +22,7 @@
TIMELINE_CREATE = true; # take a snapshot every hour
TIMELINE_LIMIT_HOURLY = 2;
TIMELINE_LIMIT_DAILY = 3;
TIMELINE_LIMIT_DAILY = 2;
TIMELINE_LIMIT_WEEKLY = 0;
TIMELINE_LIMIT_MONTHLY = 0;
TIMELINE_LIMIT_YEARLY = 0;
@@ -34,4 +34,6 @@
# TIMELINE_LIMIT_MONTHLY = 0;
# TIMELINE_LIMIT_YEARLY = 0;
};
services.snapper.cleanupInterval = "2h"; # how frequently to gc snapshots no longer covered by the above policy (default: daily)
}

View File

@@ -955,6 +955,12 @@ in with final; {
# upstream.postBuild;
# });
wvkbd = prev.wvkbd.overrideAttrs (upstream: {
nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [
buildPackages.scdoc
];
});
# 2024/11/19: upstreaming is blocked on unar (gnustep), unless i also make that optional
xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver;
}

View File

@@ -10,13 +10,13 @@
}:
stdenv.mkDerivation {
pname = "libmegapixels";
version = "0.2.0-unstable-2024-12-28";
version = "0.2.0-unstable-2025-02-11";
src = fetchFromGitLab {
owner = "megapixels-org";
repo = "libmegapixels";
rev = "fedc8a0b314d4482b041a496295882ff8af8f59e";
hash = "sha256-KGynHMsPwkrDqC8NX9HFj2xwJrjY9AykOZTqkSgA6Eo=";
rev = "20619047551f7ffb6ab5aebfaa6783c708520775";
hash = "sha256-NCq14kBWKhsCQPLBpxdErHK+3Ih1JuAMlKXLLytS2AA=";
};
# patches = [

View File

@@ -25,13 +25,13 @@ let
in
stdenv.mkDerivation {
pname = "megapixels-next";
version = "2.0.0-alpha1-unstable-2025-01-16";
version = "2.0.0-alpha1-unstable-2025-02-11";
src = fetchFromGitLab {
owner = "megapixels-org";
repo = "Megapixels";
rev = "ae1faec57db2c6909d0216664580fc8225390bda";
hash = "sha256-/U+SXXsRXdRZnraclr+52Qpw5ogxgq837ljGESrymjk=";
rev = "2f2929800b005820a21da8f3e7cc4ba0fe51fe1d";
hash = "sha256-ehPq1UwhYv4ncAhnVjDMgGT255ZdliMw6nMzYE5qWnM=";
};
nativeBuildInputs = [

View File

@@ -8,8 +8,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}
}:
mkNixpkgs {
rev = "fa648b2835f6cc0e77bd3b246cf8c80f126f0139";
sha256 = "sha256-1Vg8DUmf9Re46lbjWq02IV0syQJLUO1y5CoUcWP5C/s=";
version = "0-unstable-2025-02-08";
rev = "49bae9aaddd584d28321f729e166903fb81ad23c";
sha256 = "sha256-mIY+RwUDvtVN1/6g0CbJKqlG3jhwR9ttX1Q3h9C0cw8=";
version = "0-unstable-2025-02-17";
branch = "master";
}

View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}
}:
mkNixpkgs {
rev = "6793b353338d2bfd6a95bef48e4bc78f6dc24436";
sha256 = "sha256-OqJKH1Rnbb/nO9ISlfDl47G1vvolHK1KiOcwhxAZ+7A=";
version = "0-unstable-2025-02-07";
rev = "fc7fa5f568c170348fa21308f135fa9cd0807725";
sha256 = "sha256-9DP8lq3aHYmSCVgDNKGiNoEHlwkz+bb+5K+KYDFF1Ng=";
version = "0-unstable-2025-02-17";
branch = "staging-next";
}

View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}
}:
mkNixpkgs {
rev = "746797476c9e43c348bc0b8d2bafa4c65b74e7c4";
sha256 = "sha256-0eXqAsNHngVQbXgXE7Fpuo3m2fL9u4zZlWkMhNsdhz0=";
version = "0-unstable-2025-02-07";
rev = "d9ea73fab625fb1f00acc75b22315a0ba49436a4";
sha256 = "sha256-uqFCZRSB1ZRKVqG9k6jh1jsvFGGCteTc6zBNzH0YHAU=";
version = "0-unstable-2025-02-16";
branch = "staging";
}

View File

@@ -6,8 +6,8 @@ let
src = fetchFromGitHub {
owner = "Mic92";
repo = "sops-nix";
rev = "4c1251904d8a08c86ac6bc0d72cc09975e89aef7";
hash = "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=";
rev = "07af005bb7d60c7f118d9d9f5530485da5d1e975";
hash = "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=";
};
flake = import "${src}/flake.nix";
evaluated = flake.outputs {
@@ -20,7 +20,7 @@ in src.overrideAttrs (base: {
# attributes required by update scripts
pname = "sops-nix";
# nix-update-script insists on this weird `assets-` version format
version = "assets-unstable-2025-01-31";
version = "assets-unstable-2025-02-11";
src = src;
passthru = base.passthru

View File

@@ -5,12 +5,12 @@
}:
stdenv.mkDerivation {
pname = "uassets";
version = "0-unstable-2025-02-07";
version = "0-unstable-2025-02-17";
src = fetchFromGitHub {
owner = "uBlockOrigin";
repo = "uAssets";
rev = "3768d8c8bcc3f7e02cea0a33769247a46a1de35c";
hash = "sha256-GDfRfR5ql6HLEm9t2WW1uRVpaa3obIOv5Gn9di2fA8w=";
rev = "981bdc26b3a1250a1b90e8dce2dd8a805381bad6";
hash = "sha256-1YM/m3LWpf8r/nZdzIr+mYqamIicGLTpa7K7RtOc1bk=";
};
dontBuild = true;

View File

@@ -8,15 +8,15 @@ let
domain = "git.uninsane.org";
owner = "colin";
repo = "uninsane";
rev = "6f48a6f7adeb015f754b83ee7c8b3e595efa5a8b";
hash = "sha256-ZaYdvK9Y9+VMuoXcsUlYe4xS/yQbwQJDrRt2VlfQNo0=";
rev = "c5f071e8b1b946de47aa88b63c2d6a96e33b4590";
hash = "sha256-J6dFS1at7vfQFfWBxSHb2iTaBdQdtzkxG+c3F1eIltY=";
};
pkg = callPackage "${src}/default.nix" { };
in
pkg.overrideAttrs (base: {
inherit src;
pname = "uninsane-dot-org";
version = "0-unstable-2024-11-16";
version = "0-unstable-2025-02-09";
passthru = (base.passthru or {}) // {
updateScript = nix-update-script {
extraArgs = [ "--version" "branch" ];