Compare commits

..

2 commits

Author SHA1 Message Date
5bc38aa909 use patched element-web
Some checks failed
Hydra nixosConfigurations.not522 Hydra build #26316 of nixos-config:pr618:nixosConfigurations.not522
Hydra nixosConfigurations.not522-installer Hydra build #26317 of nixos-config:pr618:nixosConfigurations.not522-installer
Hydra packages.x86_64-linux.element-web Hydra build #26321 of nixos-config:pr618:packages.x86_64-linux.element-web
Hydra packages.aarch64-linux.element-web Hydra build #26319 of nixos-config:pr618:packages.aarch64-linux.element-web
Hydra packages.x86_64-linux.element-desktop Hydra build #26320 of nixos-config:pr618:packages.x86_64-linux.element-desktop
Hydra packages.aarch64-linux.element-desktop Hydra build #26318 of nixos-config:pr618:packages.aarch64-linux.element-desktop
Hydra packages.riscv64-linux.package-updater Hydra build #25896 of nixos-config:pr618:packages.riscv64-linux.package-updater
2024-11-18 10:41:36 +01:00
de0149aacb update 2024-11-18 07:54:26 +01:00
3 changed files with 153 additions and 20 deletions

View file

@ -1,5 +1,25 @@
{ {
"nodes": { "nodes": {
"devshell": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1728330715,
"narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
"owner": "numtide",
"repo": "devshell",
"rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -7,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731746438, "lastModified": 1731895210,
"narHash": "sha256-f3SSp1axoOk0NAI7oFdRzbxG2XPBSIXC+/DaAXnvS1A=", "narHash": "sha256-z76Q/OXLxO/RxMII3fIt/TG665DANiE2lVvnolK2lXk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "cb64993826fa7a477490be6ccb38ba1fa1e18fa8", "rev": "639d1520df9417ca2761536c3072688569e83c80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -20,6 +40,38 @@
"type": "github" "type": "github"
} }
}, },
"element-web": {
"inputs": {
"devshell": [
"devshell"
],
"flake-compat": [
"flake-compat"
],
"flake-parts": [
"flake-parts"
],
"matrix-js-sdk": [
"matrix-js-sdk"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1731922168,
"narHash": "sha256-kDHZXas6YvkNWq5Ab038/MMPfobB6rSuJhJTp7V5K1Y=",
"owner": "darkkirb",
"repo": "element-web",
"rev": "c2e3d1415eb376f7c09d0f48c69779936e2e26d6",
"type": "github"
},
"original": {
"owner": "darkkirb",
"repo": "element-web",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -36,6 +88,26 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1730504689,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": [ "systems": [
@ -98,11 +170,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731786860, "lastModified": 1731887066,
"narHash": "sha256-130gQ5k8kZlxjBEeLpE+SvWFgSOFgQFeZlqIik7KgtQ=", "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1bd5616e33c0c54d7a5b37db94160635a9b27aeb", "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -207,6 +279,35 @@
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
} }
}, },
"matrix-js-sdk": {
"inputs": {
"devshell": [
"devshell"
],
"flake-compat": [
"flake-compat"
],
"flake-parts": [
"flake-parts"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1731919198,
"narHash": "sha256-WOTtlA2pVCh4GmIN2MQiNa0vOs57LLMIwMGKdWxdt1w=",
"owner": "darkkirb",
"repo": "matrix-js-sdk",
"rev": "ff08c2e49038fbd29472d1fe1d13593ecb416136",
"type": "github"
},
"original": {
"owner": "darkkirb",
"repo": "matrix-js-sdk",
"type": "github"
}
},
"nix-vscode-extensions": { "nix-vscode-extensions": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
@ -220,11 +321,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731808759, "lastModified": 1731894894,
"narHash": "sha256-WwJqguc/5Q7HEwHlgDzDT8mtd8ZxInxZM2neJKC1oh8=", "narHash": "sha256-HB7VHbDE+05HqreoLp9QG4sntsqV0IHo2yB1bpD1tVw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "5cf92678e6799ce45442dee4c9cb8094843c7cfa", "rev": "0982ffd1c37d8ef1a202d920e33b27b59ff30ca7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -273,11 +374,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1731816655, "lastModified": 1731912056,
"narHash": "sha256-55e1JMAuYvHZs9EICprWgJ4RmaWwDuSjzJ5K7S7zb6w=", "narHash": "sha256-1icSuV0/AtuA3CSFKs3PE2Q/BOMUgITRjQGcZzan3sI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0a14706530dcb90acecb81ce0da219d88baaae75", "rev": "fbc12b07e2ca85b424d6d7877ac711254d2d160b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -374,8 +475,11 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"devshell": "devshell",
"disko": "disko", "disko": "disko",
"element-web": "element-web",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"gitignore": "gitignore", "gitignore": "gitignore",
@ -383,6 +487,7 @@
"impermanence": "impermanence", "impermanence": "impermanence",
"lix": "lix", "lix": "lix",
"lix-module": "lix-module", "lix-module": "lix-module",
"matrix-js-sdk": "matrix-js-sdk",
"nix-vscode-extensions": "nix-vscode-extensions", "nix-vscode-extensions": "nix-vscode-extensions",
"nix2container": "nix2container", "nix2container": "nix2container",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
@ -404,11 +509,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731820690, "lastModified": 1731897198,
"narHash": "sha256-/hHFMTD+FGURXZ4JtfXoIgpy87zL505pVi6AL76Wc+U=", "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "bbab2ab9e1932133b1996baa1dc00fefe924ca81", "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -420,11 +525,11 @@
"rycee-nur-expressions": { "rycee-nur-expressions": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1731816193, "lastModified": 1731902594,
"narHash": "sha256-Y/u1O6GpvOYRbGOnwGo0Gofg5jjfaHNGP9G7yGFFfzg=", "narHash": "sha256-uSkuDGR4nPtA2ObotrF2G2fmHDEHVG7bKVb0ZLr4Cew=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "02c98c9ba4491db49ab759161fcc0ba9830d7aa0", "rev": "41a1d21207361f9369670da9d01c88fcdbfb25c3",
"revCount": 3910, "revCount": 3913,
"type": "git", "type": "git",
"url": "https://gitlab.com/rycee/nur-expressions" "url": "https://gitlab.com/rycee/nur-expressions"
}, },

View file

@ -2,14 +2,30 @@
description = "Lottes nix configuration"; description = "Lottes nix configuration";
inputs = { inputs = {
devshell = {
url = "github:numtide/devshell";
inputs.nixpkgs.follows = "nixpkgs";
};
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
element-web = {
url = "github:darkkirb/element-web";
inputs.devshell.follows = "devshell";
inputs.flake-compat.follows = "flake-compat";
inputs.flake-parts.follows = "flake-parts";
inputs.matrix-js-sdk.follows = "matrix-js-sdk";
inputs.nixpkgs.follows = "nixpkgs";
};
flake-compat = { flake-compat = {
url = "github:edolstra/flake-compat"; url = "github:edolstra/flake-compat";
flake = false; flake = false;
}; };
flake-parts = {
url = "github:hercules-ci/flake-parts";
inputs.nixpkgs-lib.follows = "nixpkgs";
};
flake-utils = { flake-utils = {
url = "github:numtide/flake-utils"; url = "github:numtide/flake-utils";
inputs.systems.follows = "systems"; inputs.systems.follows = "systems";
@ -42,6 +58,13 @@
inputs.lix.follows = "lix"; inputs.lix.follows = "lix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
matrix-js-sdk = {
url = "github:darkkirb/matrix-js-sdk";
inputs.devshell.follows = "devshell";
inputs.flake-compat.follows = "flake-compat";
inputs.flake-parts.follows = "flake-parts";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-vscode-extensions = { nix-vscode-extensions = {
url = "github:nix-community/nix-vscode-extensions"; url = "github:nix-community/nix-vscode-extensions";
inputs.flake-compat.follows = "flake-compat"; inputs.flake-compat.follows = "flake-compat";
@ -229,7 +252,11 @@
// ( // (
if name != "riscv64-linux" then if name != "riscv64-linux" then
{ {
inherit (pkgs) kodi-joyn; inherit (pkgs)
element-desktop
element-web
kodi-joyn
;
} }
else else
{ } { }

View file

@ -2,6 +2,7 @@ final: prev: {
art-lotte = final.callPackage ./art/lotte { }; art-lotte = final.callPackage ./art/lotte { };
art-lotte-bgs-nsfw = final.callPackage ./art/lotte/bgs-nsfw.nix { }; art-lotte-bgs-nsfw = final.callPackage ./art/lotte/bgs-nsfw.nix { };
art-lotte-bgs-sfw = final.callPackage ./art/lotte/bgs-sfw.nix { }; art-lotte-bgs-sfw = final.callPackage ./art/lotte/bgs-sfw.nix { };
inherit (prev.inputs.element-web.packages.${prev.system}) element-web;
fish = prev.fish.overrideAttrs { fish = prev.fish.overrideAttrs {
postPatch = '' postPatch = ''
substituteInPlace src/history.cpp --replace-fail 'vacuum = true' 'vacuum = false' substituteInPlace src/history.cpp --replace-fail 'vacuum = true' 'vacuum = false'