darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Merge pull request #403 from DarkKirb/fix-update

Browse source 
Fix-update
This commit is contained in:
Charlotte 🦝 Delenk 2024-04-27 08:18:09 +01:00 committed by GitHub
commit 137b872db3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 150 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

129
flake.lock
View file

@ -41,11 +41,11 @@
]
},
"locked": {
"lastModified": 1714065915,
"narHash": "sha256-+RGBIyy6kjrRIQCuMAXpqJDTLBM7tbp8vxYtAqqNVi0=",
"lastModified": 1714131734,
"narHash": "sha256-6dY/b8voe5Qd7GmkdzhF3w9DLZM0AkqBiHi6DRKRStI=",
"owner": "DarkKirb",
"repo": "akkoma",
"rev": "d95c54309e4a83d744cc60d675c38f154c719f00",
"rev": "cb61c42e58552a4f4bc9cd66e61fe710a78fbd09",
"type": "github"
},
"original": {
@ -245,6 +245,41 @@
"type": "github"
}
},
"element-web": {
"inputs": {
"devshell": [
"devshell"
],
"flake-compat": [
"flake-compat"
],
"flake-parts": [
"flake-parts"
],
"matrix-js-sdk": [
"matrix-js-sdk"
],
"matrix-react-sdk": [
"matrix-react-sdk"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1714113438,
"narHash": "sha256-SccTrAt658PHAA1SZzQUVxbplLDJ19kfYwluC8R7KMg=",
"owner": "DarkKirb",
"repo": "element-web",
"rev": "02b2746ff2fc5d47dc4056489ec8a99016a54ba1",
"type": "github"
},
"original": {
"owner": "DarkKirb",
"repo": "element-web",
"type": "github"
}
},
"firefox": {
"inputs": {
"cachix": [
@ -264,11 +299,11 @@
]
},
"locked": {
"lastModified": 1714047754,
"narHash": "sha256-verNuAw/hw9koXE3nFmYUF4Q7pEwRQKBuxqxlnObk9M=",
"lastModified": 1714179399,
"narHash": "sha256-tUFWCCfNEHvofsrfnKuPyJYsGW19rw/nrZLblBM4P7Y=",
"owner": "nix-community",
"repo": "flake-firefox-nightly",
"rev": "7b90fe8fbbb2a7b2ee912fac53415d9bee4691e6",
"rev": "6dba3a28af00bb632154bd653ec2baf0a02ba91a",
"type": "github"
},
"original": {
@ -528,6 +563,67 @@
"type": "github"
}
},
"matrix-js-sdk": {
"inputs": {
"devshell": [
"devshell"
],
"flake-compat": [
"flake-compat"
],
"flake-parts": [
"flake-parts"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1714110670,
"narHash": "sha256-jOAAzMKMA+qa5k0EWveY3JiDa/XdDXWPM7XufudR+Xg=",
"owner": "DarkKirb",
"repo": "matrix-js-sdk",
"rev": "529c67561047e8821756259ab66955a4b5657ed6",
"type": "github"
},
"original": {
"owner": "DarkKirb",
"repo": "matrix-js-sdk",
"type": "github"
}
},
"matrix-react-sdk": {
"inputs": {
"devshell": [
"devshell"
],
"flake-compat": [
"flake-compat"
],
"flake-parts": [
"flake-parts"
],
"matrix-js-sdk": [
"matrix-js-sdk"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1714112344,
"narHash": "sha256-sgqXSsWArkiejD2EemJwyDb2ne7fvnk5WifdS+IJEK0=",
"owner": "DarkKirb",
"repo": "matrix-react-sdk",
"rev": "6d160becbb85271909190ae1854e0613b7deb667",
"type": "github"
},
"original": {
"owner": "DarkKirb",
"repo": "matrix-react-sdk",
"type": "github"
}
},
"mozilla": {
"locked": {
"lastModified": 1704373101,
@ -599,11 +695,11 @@
]
},
"locked": {
"lastModified": 1713921309,
"narHash": "sha256-9/5xt3019W55Vu8MX9LlaFTFoNd4dwLqwvUEDWjn+KU=",
"lastModified": 1714093995,
"narHash": "sha256-7oYv0EJ2iqL9MZiB7QRE63nHDVMuyTgukgYZDdjL8Kg=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "a21a6f3321682226e47f7ead4d2eba59a3f63654",
"rev": "a8c2a0e160e1212c67724aa89a823b55d423d157",
"type": "github"
},
"original": {
@ -704,11 +800,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1714067325,
"narHash": "sha256-kEwmF1To9/fbvDm073EMKuw7Jv7dQLCh84crqmpYBKQ=",
"lastModified": 1714196626,
"narHash": "sha256-p0dTQq/5HD4rP6Qi+QMaaGMqHEjMwoD/JuepCP3b1sY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "349fa7233ff3290bd7c2fffa8f0403871395734f",
"rev": "b35d724afe129b2ed42d46e3f0fe55cc5015ad99",
"type": "github"
},
"original": {
@ -728,6 +824,7 @@
"crane": "crane",
"devshell": "devshell",
"dns": "dns",
"element-web": "element-web",
"firefox": "firefox",
"flake-compat": "flake-compat_4",
"flake-parts": "flake-parts",
@ -737,6 +834,8 @@
"hydra": "hydra",
"impermanence": "impermanence",
"lib-aggregate": "lib-aggregate",
"matrix-js-sdk": "matrix-js-sdk",
"matrix-react-sdk": "matrix-react-sdk",
"mozilla": "mozilla",
"naersk": "naersk",
"nix-gaming": "nix-gaming",
@ -759,11 +858,11 @@
]
},
"locked": {
"lastModified": 1714011248,
"narHash": "sha256-vKk9IOxZJ52Ao3uIRIjHRYYe+IpVOY6NzwToSxaO1J0=",
"lastModified": 1714097613,
"narHash": "sha256-044xbpBszupqN3nl/CGOCJtTQ4O6Aca81mJpX45i8/I=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "9a2a11479b94afaf1ecc46384b27abda0d3d5f9d",
"rev": "2a42c742ab04b61d9b2f1edf392842cf9f27ebfd",
"type": "github"
},
"original": {

25
flake.nix
View file

@ -54,13 +54,21 @@ rec {
devshell = {
url = "github:numtide/devshell";
inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems";
};
dns = {
url = "github:DarkKirb/dns.nix";
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs";
};
element-web = {
url = "github:DarkKirb/element-web";
inputs.flake-parts.follows = "flake-parts";
inputs.nixpkgs.follows = "nixpkgs";
inputs.matrix-react-sdk.follows = "matrix-react-sdk";
inputs.matrix-js-sdk.follows = "matrix-js-sdk";
inputs.devshell.follows = "devshell";
inputs.flake-compat.follows = "flake-compat";
};
firefox = {
url = "github:nix-community/flake-firefox-nightly";
inputs.cachix.follows = "nixpkgs";
@ -102,6 +110,21 @@ rec {
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs-lib.follows = "nixpkgs";
};
matrix-react-sdk = {
url = "github:DarkKirb/matrix-react-sdk";
inputs.flake-parts.follows = "flake-parts";
inputs.nixpkgs.follows = "nixpkgs";
inputs.matrix-js-sdk.follows = "matrix-js-sdk";
inputs.devshell.follows = "devshell";
inputs.flake-compat.follows = "flake-compat";
};
matrix-js-sdk = {
url = "github:DarkKirb/matrix-js-sdk";
inputs.flake-parts.follows = "flake-parts";
inputs.nixpkgs.follows = "nixpkgs";
inputs.devshell.follows = "devshell";
inputs.flake-compat.follows = "flake-compat";
};
mozilla.url = "github:mozilla/nixpkgs-mozilla";
naersk = {
url = "github:nix-community/naersk/master";

3
overlays/default.nix
View file

@ -1,5 +1,5 @@
inputs: system: self: prev: let
inherit (inputs) nixpkgs;
inherit (inputs) nixpkgs element-web;
in
with nixpkgs.legacyPackages.${system}; {
fcitx5-table-extra = prev.fcitx5-table-extra.overrideAttrs (super: {
@ -63,4 +63,5 @@ in
sliding-sync = self.callPackage ../packages/matrix/sliding-sync {};
yiffstash = self.python3Packages.callPackage ../packages/python/yiffstash.nix {};
rosaflags = self.callPackage ../packages/art/emoji/rosaflags.nix {};
element-web = element-web.packages.${system}.element-web;
}

2
packages/fonts/nasin-nanpa/default.nix
View file

@ -26,7 +26,7 @@ in
passthru.updateScript = writeScript "update-nasin-nanpa" ''
${../../scripts/update-git.sh} https://github.com/ETBCOR/nasin-nanpa fonts/nasin-nanpa/source.json
if [ "$(git diff -- fonts/nasin-nanpa/source.json)" ]; then
SRC_PATH=$(nix-build -E '(import ./. {}).nasin-nanpa.src')
SRC_PATH=$(nix-build -E '(import ../.).packages.x86_64-linux.nasin-nanpa.src')
ls $SRC_PATH/ffversions/*/*.sfd | sort | tail -n1 | sed 's|[/-]| |g' | sed 's/.sfd//' | awk '{print "{\"major\": \"" $6 "\", \"minor\": \"" $9 "\"}" }' > fonts/nasin-nanpa/version.json
fi
'';

2
packages/matrix/matrix-media-repo/default.nix
View file

@ -61,7 +61,7 @@ in
passthru.updateScript = writeScript "update-matrix-media-repo" ''
${../../scripts/update-git.sh} "https://github.com/turt2live/matrix-media-repo" matrix/matrix-media-repo/source.json
if [ "$(git diff -- matrix/matrix-media-repo/source.json)" ]; then
SRC_PATH=$(nix-build -E '(import ./. {}).${pname}.src')
SRC_PATH=$(nix-build -E '(import ../.).packages.x86_64-linux.${pname}.src')
${../../scripts/update-go.sh} $SRC_PATH matrix/matrix-media-repo/
fi
'';

2
packages/matrix/mautrix-discord/default.nix
View file

@ -34,7 +34,7 @@ in
passthru.updateScript = writeScript "update-matrix-media-repo" ''
${../../scripts/update-git.sh} "https://github.com/mautrix/discord" matrix/mautrix-discord/source.json
if [ "$(git diff -- matrix/mautrix-discord/source.json)" ]; then
SRC_PATH=$(nix-build -E '(import ./. {}).${pname}.src')
SRC_PATH=$(nix-build -E '(import ../.).packages.x86_64-linux.${pname}.src')
${../../scripts/update-go.sh} $SRC_PATH matrix/mautrix-discord/
fi
'';

2
packages/matrix/mautrix-whatsapp/default.nix
View file

@ -34,7 +34,7 @@ in
passthru.updateScript = writeScript "update-mautrix-whatsapp" ''
${../../scripts/update-git.sh} "https://github.com/mautrix/whatsapp" matrix/mautrix-whatsapp/source.json
if [ "$(git diff -- matrix/mautrix-whatsapp/source.json)" ]; then
SRC_PATH=$(nix-build -E '(import ./. {}).${pname}.src')
SRC_PATH=$(nix-build -E '(import ../.).packages.x86_64-linux.${pname}.src')
${../../scripts/update-go.sh} $SRC_PATH matrix/mautrix-whatsapp/
fi
'';

2
packages/matrix/sliding-sync/default.nix
View file

@ -30,7 +30,7 @@ in
passthru.updateScript = writeScript "update-sliding-sync" ''
${../../scripts/update-git.sh} "https://github.com/matrix-org/sliding-sync" matrix/sliding-sync/source.json
if [ "$(git diff -- matrix/sliding-sync/source.json)" ]; then
SRC_PATH=$(nix-build -E '(import ./. {}).${pname}.src')
SRC_PATH=$(nix-build -E '(import ../.).packages.x86_64-linux.${pname}.src')
${../../scripts/update-go.sh} $SRC_PATH matrix/sliding-sync/
fi
'';

10
packages/matrix/sliding-sync/source.json
View file

@ -1,10 +1,10 @@
{
"url": "https://github.com/matrix-org/sliding-sync",
"rev": "abf5aeff82069c7d180d007d2a3c64d13c05a234",
"date": "2024-04-24T16:55:25+01:00",
"path": "/nix/store/f7prlvm7qz1j61c91dq2gjw06shys810-sliding-sync",
"sha256": "03h18iv1zdwxvlwf0ma54kkk95xvg80c7gwi77blgamlfk6rc01r",
"hash": "sha256-OQCWzXS0qkfXOZG/wwB6u5c05yRFVeA43Z23H3ZEAQ4=",
"rev": "8c76aad4e9aca7a201a19cff562f03f019aae974",
"date": "2024-04-26T16:42:35+01:00",
"path": "/nix/store/z0d45wdn9bdvkchcdyxskbvvjhx5hv3c-sliding-sync",
"sha256": "08y57alglckhg2nblgr9nxap3nnbiw2kvn9g0m8jxp9dfncgn60m",
"hash": "sha256-FRj7mHUt3S5RBS/ZPQWPy9pxVbcpP7qseHAy+qg6xSM=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,