Skip to content
Snippets Groups Projects
Verified Commit d0b56d27 authored by Volker Schukai's avatar Volker Schukai :alien:
Browse files

chore: update nix

parent 13f0abc1
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
flake.lock
+ 118
− 14
View file @ d0b56d27
...@@ -25,6 +25,21 @@ ...@@ -25,6 +25,21 @@
"url": "https://gitlab.schukai.com/alvine/certificates.git" "url": "https://gitlab.schukai.com/alvine/certificates.git"
} }
}, },
"common": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1,
"narHash": "sha256-J3hQz8ptyNNv+iGz6q0boMlQPnLWT2pDpGFi8aoo3Zk=",
"path": "./common",
"type": "path"
},
"original": {
"path": "./common",
"type": "path"
}
},
"commonFlake": { "commonFlake": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
...@@ -47,24 +62,26 @@ ...@@ -47,24 +62,26 @@
}, },
"commonFlake_2": { "commonFlake_2": {
"inputs": { "inputs": {
"common": "common",
"flake-utils": "flake-utils_2",
"git-commit": "git-commit",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"version": "version"
}, },
"locked": { "locked": {
"dir": "common", "lastModified": 1738246616,
"lastModified": 1718788884, "narHash": "sha256-3jleuvG7OUkVAIyszgQ3+8erCgA9KMt6REQEfgDCkCw=",
"narHash": "sha256-PefMbkGNMK9TN1qcNL9OkFVTNdv6wo6XoaS8eTdsY04=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "abda2dc723e13dfc835535593321c514666e679e", "rev": "ffd7bd5563d8e90aa6518a55fd18262a71a23690",
"revCount": 39, "revCount": 41,
"type": "git", "type": "git",
"url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git?dir=common" "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git"
}, },
"original": { "original": {
"dir": "common",
"type": "git", "type": "git",
"url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git?dir=common" "url": "https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git"
} }
}, },
"flake-utils": { "flake-utils": {
...@@ -102,6 +119,24 @@ ...@@ -102,6 +119,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakeUtils": { "flakeUtils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
...@@ -120,6 +155,24 @@ ...@@ -120,6 +155,24 @@
"type": "github" "type": "github"
} }
}, },
"git-commit": {
"inputs": {
"nixpkgs": [
"commonFlake",
"nixpkgs"
]
},
"locked": {
"lastModified": 1,
"narHash": "sha256-ExMI4C4lehy6S+QOMORbNz/xftV3P2KDeFPmiq+x150=",
"path": "./git-commit",
"type": "path"
},
"original": {
"path": "./git-commit",
"type": "path"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1714971268, "lastModified": 1714971268,
...@@ -168,11 +221,26 @@ ...@@ -168,11 +221,26 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1737885640, "lastModified": 1714971268,
"narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=", "narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.11",
"type": "indirect"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1738163270,
"narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4e96537f163fad24ed9eb317798a79afc85b51b7", "rev": "59e618d90c065f55ae48446f307e8c09565d5ab0",
"type": "github" "type": "github"
}, },
"original": { "original": {
...@@ -186,8 +254,8 @@ ...@@ -186,8 +254,8 @@
"inputs": { "inputs": {
"certificatesFlake": "certificatesFlake", "certificatesFlake": "certificatesFlake",
"commonFlake": "commonFlake_2", "commonFlake": "commonFlake_2",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"versionFlake": "versionFlake_2" "versionFlake": "versionFlake_2"
} }
}, },
...@@ -236,6 +304,42 @@ ...@@ -236,6 +304,42 @@
"type": "github" "type": "github"
} }
}, },
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"version": {
"inputs": {
"nixpkgs": [
"commonFlake",
"nixpkgs"
]
},
"locked": {
"lastModified": 1736378864,
"narHash": "sha256-7JSw/0AbjzM9jdkJQILEHKq8hjfTDB1tHJPLDI2oLVo=",
"ref": "refs/heads/master",
"rev": "b721b3d463b9f796b7652df59de975a362cc7542",
"revCount": 130,
"type": "git",
"url": "https://gitlab.schukai.com/oss/utilities/version.git"
},
"original": {
"type": "git",
"url": "https://gitlab.schukai.com/oss/utilities/version.git"
}
},
"versionFlake": { "versionFlake": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
......
flake.nix
+ 1
− 1
View file @ d0b56d27
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
flake-utils = {url = "github:numtide/flake-utils";}; flake-utils = {url = "github:numtide/flake-utils";};
commonFlake = { commonFlake = {
url = "git+https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git?dir=common"; url = "git+https://gitlab.schukai.com/schukai/entwicklung/nix-flakes.git";
flake = true; flake = true;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
......
nix/config/release.nix
+ 1
− 1
View file @ d0b56d27
source/components/datatable/dataset.mjs
+ 1
− 1
View file @ d0b56d27
source/dom/customcontrol.mjs
+ 318
− 321
View file @ d0b56d27
...@@ -324,8 +324,7 @@ class CustomControl extends CustomElement { ...@@ -324,8 +324,7 @@ class CustomControl extends CustomElement {
* @param {string} state * @param {string} state
* @param {string} mode * @param {string} mode
*/ */
formStateRestoreCallback(state, mode) { formStateRestoreCallback(state, mode) {}
}
/** /**
* *
...@@ -364,7 +363,6 @@ const debounceValueSymbol = Symbol("debounceValue"); ...@@ -364,7 +363,6 @@ const debounceValueSymbol = Symbol("debounceValue");
function initValueAttributeObserver() { function initValueAttributeObserver() {
const self = this; const self = this;
this[attributeObserverSymbol]["value"] = () => { this[attributeObserverSymbol]["value"] = () => {
if (self[debounceValueSymbol] instanceof DeadMansSwitch) { if (self[debounceValueSymbol] instanceof DeadMansSwitch) {
try { try {
self[debounceValueSymbol].touch(); self[debounceValueSymbol].touch();
...@@ -385,7 +383,6 @@ function initValueAttributeObserver() { ...@@ -385,7 +383,6 @@ function initValueAttributeObserver() {
setTimeout(() => { setTimeout(() => {
this.setOption("value", this.getAttribute("value")); this.setOption("value", this.getAttribute("value"));
}, 0); }, 0);
} }
}); });
}; };
......
source/dom/updater.mjs
+ 796
− 796
View file @ d0b56d27
...@@ -36,7 +36,10 @@ import {validateArray, validateInstance} from "../types/validate.mjs"; ...@@ -36,7 +36,10 @@ import {validateArray, validateInstance} from "../types/validate.mjs";
import { clone } from "../util/clone.mjs"; import { clone } from "../util/clone.mjs";
import { trimSpaces } from "../util/trimspaces.mjs"; import { trimSpaces } from "../util/trimspaces.mjs";
import { addAttributeToken, addToObjectLink } from "./attributes.mjs"; import { addAttributeToken, addToObjectLink } from "./attributes.mjs";
import {CustomElement, updaterTransformerMethodsSymbol} from "./customelement.mjs"; import {
CustomElement,
updaterTransformerMethodsSymbol,
} from "./customelement.mjs";
import { findTargetElementFromEvent } from "./events.mjs"; import { findTargetElementFromEvent } from "./events.mjs";
import { findDocumentTemplate } from "./template.mjs"; import { findDocumentTemplate } from "./template.mjs";
import { getWindow } from "./util.mjs"; import { getWindow } from "./util.mjs";
...@@ -416,8 +419,7 @@ function retrieveAndSetValue(element) { ...@@ -416,8 +419,7 @@ function retrieveAndSetValue(element) {
.map((v) => { .map((v) => {
try { try {
return parseInt(v, 10); return parseInt(v, 10);
} catch (e) { } catch (e) {}
}
return -1; return -1;
}) })
.filter((v) => v !== -1); .filter((v) => v !== -1);
...@@ -879,7 +881,6 @@ function runUpdateAttributes(container, parts, subject) { ...@@ -879,7 +881,6 @@ function runUpdateAttributes(container, parts, subject) {
*/ */
function handleInputControlAttributeUpdate(element, name, value) { function handleInputControlAttributeUpdate(element, name, value) {
if (element instanceof HTMLSelectElement) { if (element instanceof HTMLSelectElement) {
switch (element.type) { switch (element.type) {
case "select-multiple": case "select-multiple":
...@@ -920,7 +921,6 @@ function handleInputControlAttributeUpdate(element, name, value) { ...@@ -920,7 +921,6 @@ function handleInputControlAttributeUpdate(element, name, value) {
element.value = value === undefined ? "" : value; element.value = value === undefined ? "" : value;
} }
break; break;
} }
} else if (element instanceof HTMLTextAreaElement) { } else if (element instanceof HTMLTextAreaElement) {
if (name === "value") { if (name === "value") {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment