Compare commits

..

3 Commits

Author SHA1 Message Date
github-actions[bot]
c4e02e4353 automated: Update flake.lock
All checks were successful
Check Nix flake / Perform Nix flake checks (pull_request) Successful in 5m17s
Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 27s
Check Nix formatting / Perform Nix format checks (pull_request) Successful in 2m12s
- The following Nix Flake inputs were updated:

Flake input changes:

```shell
• Updated input 'firefox-addons':
    'gitlab:rycee/nur-expressions/26c86ba664f227c6abb383d3ca8db9365f275766?dir=pkgs/firefox-addons&narHash=sha256-hyXsQVgl/URb13iWEONwV3gGZ9IU90Q9yPmn5xoWP/8%3D' (2025-05-26)
  → 'gitlab:rycee/nur-expressions/42b96163341bdb7934cf880307f166f0238038ab?dir=pkgs/firefox-addons&narHash=sha256-kjHOCsU66vlEv0NIyrMYmg9DvUiLsEGkhxtPiYIdx5g%3D' (2025-05-29)
• Updated input 'home-manager':
    'github:nix-community/home-manager/d23d20f55d49d8818ac1f1b2783671e8a6725022?narHash=sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA%3D' (2025-05-26)
  → 'github:nix-community/home-manager/8a4b38262755fce39551e1182af1621a06ddde35?narHash=sha256-q3Hz7g7TncnU2A01GxFFWPCrVWscrHr5cBIJw6BYmgM%3D' (2025-05-30)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/e90345deff50af9cb5e75b20fda026a9c97b4e40?narHash=sha256-FLJC/Q0Ck73xhVWn0swwsFWDmwufHXYFtyWbbrXgU3Y%3D' (2025-05-26)
  → 'github:nixos/nixpkgs/7f8ad4ffb25cbd66a69326d442c1b5d9fcbb1945?narHash=sha256-Lkx8TmccNv4NZRACcwhK4etGlxjQzCSzLGvAEiXabXM%3D' (2025-05-29)
• Updated input 'nixpkgs-stable':
    'github:nixos/nixpkgs/f09dede81861f3a83f7f06641ead34f02f37597f?narHash=sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk%3D' (2025-05-23)
  → 'github:nixos/nixpkgs/78add7b7abb61689e34fc23070a8f55e1d26185b?narHash=sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0%3D' (2025-05-28)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/9c8ea175cf9af29edbcff121512e44092a8f37e4?narHash=sha256-x5UuDKP2Ui/TresAngUo9U4Ss9xfOmN8dAXU8OrkZmA%3D' (2025-05-27)
  → 'github:oxalica/rust-overlay/4bf1892eb81113e868efe67982b64f1da15c8c5a?narHash=sha256-veMuFa9cq/XgUXp1S57oC8K0TIw3XyZWL2jIyGWlW0c%3D' (2025-05-29)
• Updated input 'stylix':
    'github:danth/stylix/1fdbf01ebe4b7838aa3d95334325ce8445625332?narHash=sha256-reC7nvUfJMaIYJb5pVOuTFbOfj/L9eo21drj%2B9EbrkE%3D' (2025-05-26)
  → 'github:danth/stylix/838df8b8ad7d993d4de4af144f57bca0d5d1329a?narHash=sha256-BX7xKAzDh2d6Rn1SwYnhJwpMdyGNVehrBjIQ9lymySE%3D' (2025-05-30)
```

Flake evaluation diff:

```shell
comparing nixosConfigurations.palatine-hill.config.system.build.toplevel:
<<< /nix/store/s5f0cd3f4rrvl9wd83srr5p7fizjgjb9-nixos-system-palatine-hill-25.11.20250526.e90345d.drv
>>> /nix/store/ysrdfcfsdmm2xmwwpjr2ccafcw6i128x-nixos-system-palatine-hill-25.11.20250529.7f8ad4f.drv
Version changes:
[C.]  #01  apr                         1.patch, 1.7.5 x2, 1.7.5.tar.bz2 x2 -> 1.patch, 1.7.5, 1.7.5.tar.bz2, 1.7.6, 1.7.6.tar.bz2
[U.]  #02  chromedriver-unwrapped      136.0.7103.113 -> 137.0.7151.55
[C.]  #03  chromium                    126-llvm-17.patch, 129-rust.patch, 136-nodejs-assert-minimal-version-instead-of-exact-match.patch, 136.0.7103.113 -> 126-llvm-17.patch, 129-rust.patch, 136-nodejs-assert-minimal-version-instead-of-exact-match.patch, 137-llvm-19.patch, 137.0.7151.55
[U.]  #04  chromium-unwrapped          136.0.7103.113 -> 137.0.7151.55
[U.]  #05  gn                          6e8e0d6 -> 85cc21e
[U.]  #06  intel-compute-runtime       25.13.33276.16 -> 25.18.33578.6
[U.]  #07  jellyfin-ffmpeg             7.1.1-1 -> 7.1.1-3
[U.]  #08  libplacebo                  7.349.0 -> 7.351.0
[U.]  #09  mkpasswd                    5.6.0 -> 5.6.1
[U.]  #10  nh                          4.0.3, 4.0.3-vendor, 4.0.3-vendor-staging -> 4.1.0, 4.1.0-vendor, 4.1.0-vendor-staging
[U.]  #11  nixos-system-palatine-hill  25.11.20250526.e90345d -> 25.11.20250529.7f8ad4f
[U.]  #12  python3.12-identify         2.6.10 -> 2.6.12
[U.]  #13  strace                      6.14, 6.14.tar.xz -> 6.15, 6.15.tar.xz
[D.]  #14  xow_dongle-firmware         2017-07, 2017-07-zstd -> 0-unstable-2025-04-22, 0-unstable-2025-04-22-zstd
Added packages:
[A.]  #1  10bdbd8b5b0b43445aff23dcd412f25cf6aa328a.patch  <none>
[A.]  #2  1b421e4978440234fb73117c8505dad1ccc68d46.patch  <none>
[A.]  #3  b62e911341c8ec7446378b477c47da4256053dc0.patch  <none>
[A.]  #4  mqn6r053nzldqbyih1cvsvmkk9b1v3j5-source         <none>
[A.]  #5  pdfium-Fix-build-with-system-libpng.patch       <none>
[A.]  #6  xow_dongle.cab                                  <none>
[A.]  #7  xow_dongle_045e_02e6.cab                        <none>
Removed packages:
[R.]  #1  1cd6a87c                                                       623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab
[R.]  #2  add-more-CFI-suppressions-for-inline-PipeWire-functions.patch  <none>
[R.]  #3  nrcgjz3s6p1hxh569w86q69hsy38ip09-source                        <none>
Closure size: 12116 -> 12121 (1563 paths added, 1558 paths removed, delta +5, disk usage +74.7KiB).

comparing devShells.x86_64-linux.default:
<<< /nix/store/xar1rnaymb89q562ljk2ird9rikszkzd-nix-shell.drv
>>> /nix/store/kk6xdmqpms7cm5y7fz7i65lrzd63qgnn-nix-shell.drv
Version changes:
[U.]  #1  python3.12-identify  2.6.10 -> 2.6.12
Closure size: 3410 -> 3410 (567 paths added, 567 paths removed, delta +0, disk usage +616B).

comparing formatter.x86_64-linux:
<<< /nix/store/hrbbszfa4z1g1azs8nkk5ylci50njkih-nixfmt-unstable-2025-04-04.drv
>>> /nix/store/g6asyjiqa3ik5s0ci63ls3gj7fn42i9j-nixfmt-unstable-2025-04-04.drv
No version or selection state changes.
Closure size: 1308 -> 1308 (83 paths added, 83 paths removed, delta +0, disk usage +472B).

comparing packages.x86_64-linux.lego-latest:
<<< /nix/store/vi011r7c7lzfzfhxszy0wadq6x4dcs5p-lego-4.21.0.drv
>>> /nix/store/vi011r7c7lzfzfhxszy0wadq6x4dcs5p-lego-4.21.0.drv
No version or selection state changes.
Closure size: 800 -> 800 (0 paths added, 0 paths removed, delta +0, disk usage +0B).

comparing nixosConfigurations.artemision.config.system.build.toplevel:
<<< /nix/store/951fqs4xjp4k23rrn3kws7zqd7xpxd2w-nixos-system-artemision-25.11.20250526.e90345d.drv
>>> /nix/store/fdfqphrmdirnv64sbkh2c27qy59qykcb-nixos-system-artemision-25.11.20250529.7f8ad4f.drv
Version changes:
[U.]  #01  OVMF                     202411 x2 -> 202505 x2
[U.]  #02  amdgpu_top               0.10.4, 0.10.4-vendor, 0.10.4-vendor-staging -> 0.10.5, 0.10.5-vendor, 0.10.5-vendor-staging
[C.]  #03  apr                      1.patch, 1.7.5, 1.7.5.tar.bz2 -> 1.patch, 1.7.6, 1.7.6.tar.bz2
[U.]  #04  candy-icons              0-unstable-2025-05-08 -> 0-unstable-2025-05-24
[U.]  #05  chromedriver-unwrapped   136.0.7103.113 -> 137.0.7151.55
[C.]  #06  chromium                 126-llvm-17.patch, 129-rust.patch, 136-nodejs-assert-minimal-version-instead-of-exact-match.patch, 136.0.7103.113 -> 126-llvm-17.patch, 129-rust.patch, 136-nodejs-assert-minimal-version-instead-of-exact-match.patch, 137-llvm-19.patch, 137.0.7151.55
[U.]  #07  chromium-unwrapped       136.0.7103.113 -> 137.0.7151.55
[U.]  #08  edk2                     202411, 202411-unvendored-src -> 202505, 202505-unvendored-src
[C.]  #09  firefox                  128.5.0esr.source.tar.xz, 138.0.4, 138.0.4.source.tar.xz -> 128.5.0esr.source.tar.xz, 139.0, 139.0.source.tar.xz
[U.]  #10  firefox-unwrapped        138.0.4 -> 139.0
[C.]  #11  gamescope                <none>, 3.16.9 -> <none>, 3.16.10
[U.]  #12  gn                       6e8e0d6 -> 85cc21e
[U.]  #13  iperf                    3.18, 3.18.tar.gz -> 3.19, 3.19.tar.gz
[C.]  #14  libplacebo               5.264.1, 7.349.0 -> 5.264.1, 7.351.0
[U.]  #15  mkpasswd                 5.6.0 -> 5.6.1
[D.]  #16  mlt                      7.32.0 -> 7.30.0
[U.]  #17  nh                       4.0.3, 4.0.3-vendor, 4.0.3-vendor-staging -> 4.1.0, 4.1.0-vendor, 4.1.0-vendor-staging
[U.]  #18  nixos-system-artemision  25.11.20250526.e90345d -> 25.11.20250529.7f8ad4f
[U.]  #19  nmap                     7.96, 7.96.tar.bz2 -> 7.97, 7.97.tar.bz2
[C.]  #20  nss                      3.79.4, 3.79.4.tar.gz, 3.86.tar.gz, 3.101.2, 3.102.1-with-nspr-4.35.tar.gz, 3.111 -> 3.79.4, 3.79.4.tar.gz, 3.86.tar.gz, 3.101.2, 3.102.1-with-nspr-4.35.tar.gz, 3.112
[C.]  #21  openssl                  3.0.8 x3, 3.0.8.tar.gz x2, 3.0.16.tar.gz x2, 3.4.1 x4, 3.4.1.tar.gz x3 -> 3.0.8 x3, 3.0.8.tar.gz x2, 3.0.16.tar.gz, 3.4.1 x4, 3.4.1.tar.gz x3
[U.]  #22  python3.12-identify      2.6.10 -> 2.6.12
[U.]  #23  python3.12-ocrmypdf      16.10.1 -> 16.10.2
[U.]  #24  rclone                   1.69.2, 1.69.2-go-modules -> 1.69.3, 1.69.3-go-modules
[U.]  #25  snobol4                  2.3.2, 2.3.2.tar.gz -> 2.3.3, 2.3.3.tar.gz
[C.]  #26  source                   <none> x1780 -> <none> x1786
[U.]  #27  spotify                  1.2.59.514.g834e17d4, 1.2.59.514.g834e17d4-86.snap -> 1.2.60.564.gcc6305cb, 1.2.60.564.gcc6305cb-87.snap
[U.]  #28  strace                   6.14, 6.14.tar.xz -> 6.15, 6.15.tar.xz
[U.]  #29  uutils-coreutils         0.0.30, 0.0.30-vendor, 0.0.30-vendor-staging -> 0.1.0, 0.1.0-vendor, 0.1.0-vendor-staging
[U.]  #30  wolfssl-all              5.7.4 -> 5.7.6
[U.]  #31  zoxide                   0.9.7, 0.9.7-vendor, 0.9.7-vendor-staging -> 0.9.8, 0.9.8-vendor, 0.9.8-vendor-staging
Added packages:
[A.]  #1  10bdbd8b5b0b43445aff23dcd412f25cf6aa328a.patch  <none>
[A.]  #2  139-relax-apple-sdk.patch                       <none>
[A.]  #3  1b421e4978440234fb73117c8505dad1ccc68d46.patch  <none>
[A.]  #4  b62e911341c8ec7446378b477c47da4256053dc0.patch  <none>
[A.]  #5  mqn6r053nzldqbyih1cvsvmkk9b1v3j5-source         <none>
[A.]  #6  pdfium-Fix-build-with-system-libpng.patch       <none>
[A.]  #7  selinux_no_auto_detect.diff                     <none>
Removed packages:
[R.]  #1  add-more-CFI-suppressions-for-inline-PipeWire-functions.patch  <none>
[R.]  #2  exit-with                                                      0-on-sigterm.patch
[R.]  #3  firefox-mac-missing-vector-header.patch                        <none>
[R.]  #4  nrcgjz3s6p1hxh569w86q69hsy38ip09-source                        <none>
[R.]  #5  purego-update.patch                                            <none>
Closure size: 19442 -> 19450 (3315 paths added, 3307 paths removed, delta +8, disk usage -1.6KiB).

comparing checks.x86_64-linux.pre-commit-check:
<<< /nix/store/fri27iqnbq1112683pfza51f8r1355xs-pre-commit-run.drv
>>> /nix/store/sidcd2xiac49rr7ykxfjk3przrn7gmcq-pre-commit-run.drv
Version changes:
[U.]  #1  python3.12-identify  2.6.10 -> 2.6.12
Added packages:
[A+]  #1  mqn6r053nzldqbyih1cvsvmkk9b1v3j5-source  <none>
Removed packages:
[R-]  #1  nrcgjz3s6p1hxh569w86q69hsy38ip09-source  <none>
Closure size: 2624 -> 2624 (316 paths added, 316 paths removed, delta +0, disk usage +512B).

```

Auto-generated by [update.yml][1] with the help of
[create-pull-request][2].

[1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/flake-update.yml
[2]: https://forgejo.stefka.eu/jiriks74/create-pull-request
2025-05-30 00:56:04 +00:00
fbe2ccf445 Merge pull request 'truncate diff if longer than 60k' (#111) from feature/trunc-diff into main
All checks were successful
Check flake.lock / Check health of `flake.lock` (push) Successful in 41s
Check Nix formatting / Perform Nix format checks (push) Successful in 3m19s
Check Nix flake / Perform Nix flake checks (push) Successful in 5m58s
Update flakes / update_lockfile (push) Successful in 11m32s
Reviewed-on: #111
2025-05-27 11:21:34 -04:00
95620e20cc
truncate diff if longer than 60k
All checks were successful
Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 42s
Check Nix formatting / Perform Nix format checks (pull_request) Successful in 3m24s
Check Nix flake / Perform Nix flake checks (pull_request) Successful in 6m12s
2025-05-27 10:57:12 -04:00
2 changed files with 21 additions and 19 deletions

36
flake.lock generated
View File

@ -75,11 +75,11 @@
},
"locked": {
"dir": "pkgs/firefox-addons",
"lastModified": 1748318605,
"narHash": "sha256-rxxxdxFGX+C6xT0QPzMY5lDSBgigqtegQfVRRrZicHg=",
"lastModified": 1748491405,
"narHash": "sha256-kjHOCsU66vlEv0NIyrMYmg9DvUiLsEGkhxtPiYIdx5g=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "0497d706cb79a3eef1f35dbc45419850c0e01bf1",
"rev": "42b96163341bdb7934cf880307f166f0238038ab",
"type": "gitlab"
},
"original": {
@ -287,11 +287,11 @@
]
},
"locked": {
"lastModified": 1748227609,
"narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=",
"lastModified": 1748563990,
"narHash": "sha256-q3Hz7g7TncnU2A01GxFFWPCrVWscrHr5cBIJw6BYmgM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022",
"rev": "8a4b38262755fce39551e1182af1621a06ddde35",
"type": "github"
},
"original": {
@ -501,11 +501,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1748037224,
"narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=",
"lastModified": 1748421225,
"narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f09dede81861f3a83f7f06641ead34f02f37597f",
"rev": "78add7b7abb61689e34fc23070a8f55e1d26185b",
"type": "github"
},
"original": {
@ -517,11 +517,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1748331301,
"narHash": "sha256-ctmI5BKx0DZn+oHg0gQfNsQzDc7jlFnSerSCPeah0qs=",
"lastModified": 1748542759,
"narHash": "sha256-Lkx8TmccNv4NZRACcwhK4etGlxjQzCSzLGvAEiXabXM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b944afb346bd59b6810ea26850fa988ccb7f6f69",
"rev": "7f8ad4ffb25cbd66a69326d442c1b5d9fcbb1945",
"type": "github"
},
"original": {
@ -611,11 +611,11 @@
]
},
"locked": {
"lastModified": 1748313401,
"narHash": "sha256-x5UuDKP2Ui/TresAngUo9U4Ss9xfOmN8dAXU8OrkZmA=",
"lastModified": 1748486227,
"narHash": "sha256-veMuFa9cq/XgUXp1S57oC8K0TIw3XyZWL2jIyGWlW0c=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "9c8ea175cf9af29edbcff121512e44092a8f37e4",
"rev": "4bf1892eb81113e868efe67982b64f1da15c8c5a",
"type": "github"
},
"original": {
@ -672,11 +672,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1748276618,
"narHash": "sha256-reC7nvUfJMaIYJb5pVOuTFbOfj/L9eo21drj+9EbrkE=",
"lastModified": 1748563993,
"narHash": "sha256-BX7xKAzDh2d6Rn1SwYnhJwpMdyGNVehrBjIQ9lymySE=",
"owner": "danth",
"repo": "stylix",
"rev": "1fdbf01ebe4b7838aa3d95334325ce8445625332",
"rev": "838df8b8ad7d993d4de4af144f57bca0d5d1329a",
"type": "github"
},
"original": {

View File

@ -12,13 +12,15 @@ def inject_diff():
out = []
with open(source_file,'r') as src:
src_content = src.read()
if len(src_content) > 60000:
logging.warning(f"{source_file} is longer than 60k characters, truncating")
src_content = src_content[:60000]
with open(target_file,'r') as tgt:
for line in tgt.readlines():
if placeholder in line:
out.append(line.replace(placeholder,src_content))
else:
out.append(line)
logging.info(out)
with open(target_file,'w') as tgt:
tgt.writelines(out)