chore: update flake.lock and update to nix 2.24
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
Flake Inputs:
• Updated input 'discord-overlay':
'github:matt1432/discord-nightly-overlay/80798c7' (2024-08-13)
→ 'github:matt1432/discord-nightly-overlay/559c675' (2024-08-14)
• Updated input 'discord-overlay/Vencord-src':
'github:Vendicated/vencord/5160f90' (2024-08-03)
→ 'github:Vendicated/vencord/4301ed8' (2024-08-13)
• Updated input 'gpu-screen-recorder-src':
'git+https://repo.dec05eba.com/gpu-screen-recorder?ref=refs/heads/master&rev=01b8cdc' (2024-08-10)
→ 'git+https://repo.dec05eba.com/gpu-screen-recorder?ref=refs/heads/master&rev=f297a92' (2024-08-15)
• Updated input 'gtk-theme-src':
'github:dracula/gtk/f339612' (2024-08-06)
→ 'github:dracula/gtk/be80a12' (2024-08-14)
• Updated input 'hyprland':
'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=3b4aabe&submodules=1' (2024-08-13)
→ 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=12d9901&submodules=1' (2024-08-15)
• Updated input 'hyprland/systems':
'github:nix-systems/default-linux/31732fc' (2023-07-14)
→ follows 'systems'
• Updated input 'jovian':
'github:Jovian-Experiments/Jovian-NixOS/9117806' (2024-08-11)
→ 'github:Jovian-Experiments/Jovian-NixOS/e4e0ca1' (2024-08-15)
• Updated input 'nh':
'github:viperML/nh/ea90538' (2024-08-07)
→ 'github:viperML/nh/24d7b24' (2024-08-15)
• Updated input 'nix-melt':
'github:nix-community/nix-melt/46d1c35' (2024-02-19)
→ 'github:bryango/nix-melt/5763489' (2024-08-13)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/a58bc8a' (2024-08-11)
→ 'github:NixOS/nixpkgs/c3aa7b8' (2024-08-14)
Docker Images:
• vegardit/gitea-act-runner dind-latest:
sha256:0f2cedb38b779319f005dea39b1ac532757aa52bf327d93e2a2d8d82a50b04eb
→ sha256:1ddf1cb7a19b7dd314e1fd5762e7e69e084d1818778f535969fd1727484ae41c
• postgres 14:
sha256:09f24db0563ca0463bad203ffd584b6e48f8f87624fe75ab3df0841c8b3ef049
→ sha256:e3cc76b6d4dfc8f3547641d67053092e7c108e03ab159c00b48fa8d891e2f7b4
• rssbridge/rss-bridge latest:
sha256:d6c6605bbb3c986a505c63625466d7fa00c1a58bf0b1c5d0c923fda0aab340c1
→ sha256:3bde3fa44e79c0bd3ed02b45e9e96456ef428cb3421a057f3dfbf310b9b1728d
• ghcr.io/immich-app/immich-machine-learning v1.112.1:
sha256:d4a5db2c7cda2897abea98a3d5fd0c3cc76618fff271708075faeee426fe1b64
→ sha256:9600eff5a66ae426293f00b171711bc1647c85cf966d759ee08ab2d05e0580b5
• ghcr.io/immich-app/immich-server v1.112.1:
sha256:14ad5881f5afbea1dbf751e14acaafe00e6b012ffb18a56e9f117b00eb067d1d
→ sha256:c4e817f0eadbd9a6c2699cc884d5e7070428daec813c17db77d31fcca5b78ca6
• nginx latest:
sha256:93db6ea665b5485e59f0b35e506456b5055925d43011bdcc459d556332d231a2
→ sha256:447a8665cc1dab95b1ca778e162215839ccbb9189104c79d7ec3a81e14577add
• onlyoffice/documentserver latest:
sha256:9b74cb0e05580bced87f9af69de68d5f4c9e5b3340448ddc94333f5f7f4eba85
→ sha256:d9437b6d8455de45a02dd5ed2529c8c19c5d1407076c03ca73e0737941ec3748
• ghcr.io/linuxserver/sabnzbd latest:
sha256:aad79c7a696a8743b87f9a0429bf5fa0be1edc8bbf00b962008dfa9893efd28e
→ sha256:95179d6de1c660d7dcd4bd3991b33871c88df1120ab84bc553c4a67e8cc412d2
This commit is contained in:
parent
0a1029e788
commit
821b36b8c2
16 changed files with 154 additions and 87 deletions
|
|
@ -29,7 +29,7 @@
|
|||
};
|
||||
|
||||
nix = {
|
||||
package = pkgs.nixVersions.nix_2_23;
|
||||
package = pkgs.nixVersions.nix_2_24;
|
||||
|
||||
# Edit nix.conf
|
||||
settings = {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
pkgs:
|
||||
pkgs.dockerTools.pullImage {
|
||||
imageName = "vegardit/gitea-act-runner";
|
||||
imageDigest = "sha256:0f2cedb38b779319f005dea39b1ac532757aa52bf327d93e2a2d8d82a50b04eb";
|
||||
sha256 = "06gm6q8ss4dkmj8vp02wmfsw4bjy8v2n4wk2n8l7ydi6qadd4w3d";
|
||||
imageDigest = "sha256:1ddf1cb7a19b7dd314e1fd5762e7e69e084d1818778f535969fd1727484ae41c";
|
||||
sha256 = "09dkfg0hwcrf2whzmspw9fn2z84hy75r2srjk1lwa4xm4dgl27q6";
|
||||
finalImageName = "vegardit/gitea-act-runner";
|
||||
finalImageTag = "dind-latest";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
pkgs:
|
||||
pkgs.dockerTools.pullImage {
|
||||
imageName = "postgres";
|
||||
imageDigest = "sha256:09f24db0563ca0463bad203ffd584b6e48f8f87624fe75ab3df0841c8b3ef049";
|
||||
imageDigest = "sha256:e3cc76b6d4dfc8f3547641d67053092e7c108e03ab159c00b48fa8d891e2f7b4";
|
||||
sha256 = "0qwjsfq7h5myqfahb9fz0xs4fg1fylrjlyv6ic72hyryhanmh46f";
|
||||
finalImageName = "postgres";
|
||||
finalImageTag = "14";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
pkgs:
|
||||
pkgs.dockerTools.pullImage {
|
||||
imageName = "postgres";
|
||||
imageDigest = "sha256:09f24db0563ca0463bad203ffd584b6e48f8f87624fe75ab3df0841c8b3ef049";
|
||||
imageDigest = "sha256:e3cc76b6d4dfc8f3547641d67053092e7c108e03ab159c00b48fa8d891e2f7b4";
|
||||
sha256 = "0qwjsfq7h5myqfahb9fz0xs4fg1fylrjlyv6ic72hyryhanmh46f";
|
||||
finalImageName = "postgres";
|
||||
finalImageTag = "14";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
pkgs:
|
||||
pkgs.dockerTools.pullImage {
|
||||
imageName = "rssbridge/rss-bridge";
|
||||
imageDigest = "sha256:d6c6605bbb3c986a505c63625466d7fa00c1a58bf0b1c5d0c923fda0aab340c1";
|
||||
sha256 = "132b7v1l6vrdxjvhg42c74y8agpjxcprg7qbl2xjv58hidf7kdp5";
|
||||
imageDigest = "sha256:3bde3fa44e79c0bd3ed02b45e9e96456ef428cb3421a057f3dfbf310b9b1728d";
|
||||
sha256 = "0slcnvhdkzkrvsx797rkly55ibw4schknnw6rw59v4f4kr7sn9s2";
|
||||
finalImageName = "rssbridge/rss-bridge";
|
||||
finalImageTag = "latest";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
pkgs:
|
||||
pkgs.dockerTools.pullImage {
|
||||
imageName = "ghcr.io/immich-app/immich-machine-learning";
|
||||
imageDigest = "sha256:d4a5db2c7cda2897abea98a3d5fd0c3cc76618fff271708075faeee426fe1b64";
|
||||
sha256 = "1rwbp94r8lnb2pv7vam9kkvk0ibv4q8p0qy91q7n243y3bdmhic3";
|
||||
imageDigest = "sha256:9600eff5a66ae426293f00b171711bc1647c85cf966d759ee08ab2d05e0580b5";
|
||||
sha256 = "1m189s6i8hii4vrsjx3ypa5p2brz8sa3fw5jyxhh6qm42r4xnp4c";
|
||||
finalImageName = "ghcr.io/immich-app/immich-machine-learning";
|
||||
finalImageTag = "v1.111.0";
|
||||
finalImageTag = "v1.112.1";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
pkgs:
|
||||
pkgs.dockerTools.pullImage {
|
||||
imageName = "ghcr.io/immich-app/immich-server";
|
||||
imageDigest = "sha256:14ad5881f5afbea1dbf751e14acaafe00e6b012ffb18a56e9f117b00eb067d1d";
|
||||
sha256 = "0wxdcag6bhbzcxmbygw4qmh9j3h32yhgh93d0fy33xh6j3akjkyb";
|
||||
imageDigest = "sha256:c4e817f0eadbd9a6c2699cc884d5e7070428daec813c17db77d31fcca5b78ca6";
|
||||
sha256 = "0vvyhijslldj7hpg33n2cvpn5wrn9fcprw8pw01zh4ziabyy3z07";
|
||||
finalImageName = "ghcr.io/immich-app/immich-server";
|
||||
finalImageTag = "v1.111.0";
|
||||
finalImageTag = "v1.112.1";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
pkgs:
|
||||
pkgs.dockerTools.pullImage {
|
||||
imageName = "ghcr.io/linuxserver/sabnzbd";
|
||||
imageDigest = "sha256:aad79c7a696a8743b87f9a0429bf5fa0be1edc8bbf00b962008dfa9893efd28e";
|
||||
sha256 = "0dangx6v4nhz80n3viwblb5qh6xa809vd20r6ryp9xd5nblf4326";
|
||||
imageDigest = "sha256:95179d6de1c660d7dcd4bd3991b33871c88df1120ab84bc553c4a67e8cc412d2";
|
||||
sha256 = "0sfschwh2dsl0pr7ns72azfa1qacmj4zv22jawkl3r4bcljdmay8";
|
||||
finalImageName = "ghcr.io/linuxserver/sabnzbd";
|
||||
finalImageTag = "latest";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
pkgs:
|
||||
pkgs.dockerTools.pullImage {
|
||||
imageName = "nginx";
|
||||
imageDigest = "sha256:93db6ea665b5485e59f0b35e506456b5055925d43011bdcc459d556332d231a2";
|
||||
sha256 = "1izwcsx4f0skgcy738xmlcqdffkfrisvhpjah1gmzyjwnwai5gjn";
|
||||
imageDigest = "sha256:447a8665cc1dab95b1ca778e162215839ccbb9189104c79d7ec3a81e14577add";
|
||||
sha256 = "08i0z4p04103k5bv8jd730d7fiz4jf4hq6abqjccl9skn8f0ghjw";
|
||||
finalImageName = "nginx";
|
||||
finalImageTag = "latest";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
pkgs:
|
||||
pkgs.dockerTools.pullImage {
|
||||
imageName = "onlyoffice/documentserver";
|
||||
imageDigest = "sha256:9b74cb0e05580bced87f9af69de68d5f4c9e5b3340448ddc94333f5f7f4eba85";
|
||||
sha256 = "16ybxll9rjab60zkz7p0j1dla1qvqh2j5n7nakcr42gsncyygw46";
|
||||
imageDigest = "sha256:d9437b6d8455de45a02dd5ed2529c8c19c5d1407076c03ca73e0737941ec3748";
|
||||
sha256 = "04kaf0n5b55vvcwwrna7icn9xfx03viri8yr085hkydb40871qpz";
|
||||
finalImageName = "onlyoffice/documentserver";
|
||||
finalImageTag = "latest";
|
||||
}
|
||||
|
|
|
|||
84
flake.lock
84
flake.lock
|
|
@ -3,11 +3,11 @@
|
|||
"Vencord-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1722704568,
|
||||
"narHash": "sha256-V3ya74uDxM+ohI2XUdzOS5EJIQYXILtgPbWTUgtKVbg=",
|
||||
"lastModified": 1723524678,
|
||||
"narHash": "sha256-q2e721U7oCIPISXrnFM4bZY6LhfQiOmb4JhBx68nVwM=",
|
||||
"owner": "Vendicated",
|
||||
"repo": "vencord",
|
||||
"rev": "5160f906f408aaadf8b10b507eb1a8f823b5b528",
|
||||
"rev": "4301ed889d59d34f7b3364dfc9fc401cf412eae7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -172,11 +172,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723532860,
|
||||
"narHash": "sha256-iGNT6haAHIm1WNg8KMsfmkJbjQVaoGsjhwxRfgsleU0=",
|
||||
"lastModified": 1723619232,
|
||||
"narHash": "sha256-P5SUQnESAr2KXaEVTlglXWy1FgG3P2BfV8cJia3eS1M=",
|
||||
"owner": "matt1432",
|
||||
"repo": "discord-nightly-overlay",
|
||||
"rev": "80798c7806efd64d2564a764eb369b41692493dc",
|
||||
"rev": "559c6753af65bc6c2889d91928ea4973ddbd14a3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -399,11 +399,11 @@
|
|||
"gpu-screen-recorder-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1723266757,
|
||||
"narHash": "sha256-g4D7q+3I+z+wAD2cp4/F18SuNkfbQt4FgoNScFELrsU=",
|
||||
"lastModified": 1723744387,
|
||||
"narHash": "sha256-wLYUUIG8aptJP/ZEoQAmCnCYAECiXj43t9b1Ap1o2Oo=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "01b8cdcb77d0821bd9af3a733329fdde5091fb24",
|
||||
"revCount": 717,
|
||||
"rev": "f297a92e05e3e57b1b9350b64c8407f4a1436f09",
|
||||
"revCount": 727,
|
||||
"type": "git",
|
||||
"url": "https://repo.dec05eba.com/gpu-screen-recorder"
|
||||
},
|
||||
|
|
@ -458,11 +458,11 @@
|
|||
"gtk-theme-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1722970642,
|
||||
"narHash": "sha256-zOLtR1R5wjgHtihO6QGBGU3RhoxBbcCNfjnwNd+aNA0=",
|
||||
"lastModified": 1723670338,
|
||||
"narHash": "sha256-c+DOYv3Eg31Fdt8qDBNYFPS/zuGInxJu2AsZqDExjPk=",
|
||||
"owner": "dracula",
|
||||
"repo": "gtk",
|
||||
"rev": "f3396127033ebfb29da1d994e4ced4a61675850a",
|
||||
"rev": "be80a123f1c47a9fdb6181e60a641778e14be2f7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -573,15 +573,17 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems",
|
||||
"systems": [
|
||||
"systems"
|
||||
],
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723579231,
|
||||
"narHash": "sha256-PL9C3aOetj+TS+vXvNhh7q5bm3g70oakg+iSu5eQBUQ=",
|
||||
"lastModified": 1723738578,
|
||||
"narHash": "sha256-TLkmHk6xWEUGpLci1QNyWRC7VFqocgBat2gl1gVXpY4=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "3b4aabe04c7756fb0a70d78b6f0e701228f46345",
|
||||
"revCount": 5087,
|
||||
"rev": "12d9901472c6f9128fa8b16c25b3a879d1859e60",
|
||||
"revCount": 5095,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland"
|
||||
|
|
@ -754,11 +756,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723367191,
|
||||
"narHash": "sha256-noi5tre7BLtxImN38jEHeVOtOG1Xu37sJFwHKSAPHjo=",
|
||||
"lastModified": 1723743257,
|
||||
"narHash": "sha256-BunNxd6XYA9cyjgxOlGQrlgkiN8ClejGVkE8KWe9F2U=",
|
||||
"owner": "Jovian-Experiments",
|
||||
"repo": "Jovian-NixOS",
|
||||
"rev": "91178062f365b64eece94c5dff93e09b07e87d9d",
|
||||
"rev": "e4e0ca14918919300e04e80c34036028b4370640",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -916,11 +918,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723021300,
|
||||
"narHash": "sha256-Ujo6MQvwolE1eWSkPXCC9WFJeLtRfnMpvxoeAGNcbFI=",
|
||||
"lastModified": 1723753423,
|
||||
"narHash": "sha256-ULsoflnTS634565jqT1IXwHzISwcphLBq+YJYL7/p/Y=",
|
||||
"owner": "viperML",
|
||||
"repo": "nh",
|
||||
"rev": "ea9053852f8575f650ca0080b2cac6735c7447f7",
|
||||
"rev": "24d7b24f567ef3345ac267f61579df291e42bd71",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1091,15 +1093,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708375128,
|
||||
"narHash": "sha256-GIASK5tYXM2TQIYwg5Kb+Kl+myZU6Mv9JT4u+gZbr30=",
|
||||
"owner": "nix-community",
|
||||
"lastModified": 1723516630,
|
||||
"narHash": "sha256-M4Vbnjd0WKCGdT4929zDDHtxWwfEIKdRqzWA71IkQMQ=",
|
||||
"owner": "bryango",
|
||||
"repo": "nix-melt",
|
||||
"rev": "46d1c35ec006da573143c78b404a5e2bd834d997",
|
||||
"rev": "5763489f6b163e62a63e3ef37f81b7bb4f2ce0b7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"owner": "bryango",
|
||||
"ref": "rust-1.80-fix-build",
|
||||
"repo": "nix-melt",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -1156,11 +1159,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1723362943,
|
||||
"narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
|
||||
"lastModified": 1723637854,
|
||||
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a58bc8ad779655e790115244571758e8de055e3d",
|
||||
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1565,7 +1568,7 @@
|
|||
"sioyek-theme-src": "sioyek-theme-src",
|
||||
"sops-nix": "sops-nix",
|
||||
"subsync": "subsync",
|
||||
"systems": "systems_2",
|
||||
"systems": "systems",
|
||||
"trash-d-src": "trash-d-src",
|
||||
"ts-for-gir-src": "ts-for-gir-src",
|
||||
"vimplugin-easytables-src": "vimplugin-easytables-src",
|
||||
|
|
@ -1703,21 +1706,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1689347949,
|
||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default-linux",
|
||||
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default-linux",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"trash-d-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
|
|||
|
|
@ -123,7 +123,10 @@
|
|||
type = "github";
|
||||
};
|
||||
hyprland = {
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
systems.follows = "systems";
|
||||
};
|
||||
submodules = true;
|
||||
type = "git";
|
||||
url = "https://github.com/hyprwm/Hyprland";
|
||||
|
|
@ -223,7 +226,8 @@
|
|||
};
|
||||
nix-melt = {
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
owner = "nix-community";
|
||||
owner = "bryango";
|
||||
ref = "rust-1.80-fix-build";
|
||||
repo = "nix-melt";
|
||||
type = "github";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -24,9 +24,12 @@ let
|
|||
repo = "nh";
|
||||
};
|
||||
|
||||
# FIXME: go back to upstream once fixed
|
||||
nix-melt = mkDep {
|
||||
owner = "nix-community";
|
||||
# owner = "nix-community";
|
||||
owner = "bryango";
|
||||
repo = "nix-melt";
|
||||
ref = "rust-1.80-fix-build";
|
||||
};
|
||||
|
||||
# These are here to make sure all 'systems' are the same
|
||||
|
|
|
|||
|
|
@ -11,23 +11,10 @@ inputs: rec {
|
|||
"jovian"
|
||||
"nixpkgs-wayland"
|
||||
])
|
||||
++ [
|
||||
inputs.self.overlays.xdg-desktop-portal-kde
|
||||
|
||||
# FIXME: https://pr-tracker.nelim.org/?pr=333586
|
||||
(final: prev: {
|
||||
egl-wayland = prev.egl-wayland.overrideAttrs (o: rec {
|
||||
version = "1.1.15";
|
||||
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "Nvidia";
|
||||
repo = o.pname;
|
||||
rev = version;
|
||||
hash = "sha256-MD+D/dRem3ONWGPoZ77j2UKcOCUuQ0nrahEQkNVEUnI=";
|
||||
};
|
||||
});
|
||||
})
|
||||
];
|
||||
++ (with inputs.self.overlays; [
|
||||
broken-packages
|
||||
xdg-desktop-portal-kde
|
||||
]);
|
||||
};
|
||||
|
||||
# Function that makes the attrs that make up the specialArgs
|
||||
|
|
|
|||
84
overlays/broken-packages/default.nix
Normal file
84
overlays/broken-packages/default.nix
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
final: prev: {
|
||||
# FIXME: https://pr-tracker.nelim.org/?pr=334866
|
||||
rubber = prev.python3Packages.buildPythonApplication rec {
|
||||
pname = "rubber";
|
||||
version = "1.6.6";
|
||||
pyproject = true;
|
||||
|
||||
src = prev.fetchFromGitLab {
|
||||
owner = "latex-rubber";
|
||||
repo = "rubber";
|
||||
rev = version;
|
||||
hash = "sha256-C26PN3jyV6qwSjgPem54bykZrpKj+n8iHYYUyR+8dgI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e '/texi2dvi/d' hatch_build.py
|
||||
|
||||
substituteInPlace tests/run.sh \
|
||||
--replace-fail /var/tmp /tmp
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [prev.python3Packages.hatchling prev.texinfo];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
pushd tests >/dev/null
|
||||
${prev.stdenv.shell} run.sh
|
||||
popd >/dev/null
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
meta.mainProgram = "rubber";
|
||||
};
|
||||
|
||||
# FIXME: https://pr-tracker.nelim.org/?pr=334814
|
||||
delta = prev.rustPlatform.buildRustPackage rec {
|
||||
pname = "delta";
|
||||
version = "0.17.0-unstable-2024-08-12";
|
||||
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "dandavison";
|
||||
repo = pname;
|
||||
rev = "a01141b72001f4c630d77cf5274267d7638851e4";
|
||||
hash = "sha256-My51pQw5a2Y2VTu39MmnjGfmCavg8pFqOmOntUildS0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Rlc3Bc6Jh89KLLEWBWQB5GjoeIuHnwIVZN/MVFMjY24=";
|
||||
|
||||
nativeBuildInputs = with prev; [
|
||||
installShellFiles
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = with prev;
|
||||
[
|
||||
oniguruma
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk_11_0.frameworks.Foundation
|
||||
];
|
||||
|
||||
nativeCheckInputs = [prev.git];
|
||||
|
||||
env.RUSTONIG_SYSTEM_LIBONIG = true;
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd delta \
|
||||
etc/completion/completion.{bash,fish,zsh}
|
||||
'';
|
||||
|
||||
# test_env_parsing_with_pager_set_to_bat sets environment variables,
|
||||
# which can be flaky with multiple threads:
|
||||
# https://github.com/dandavison/delta/issues/1660
|
||||
dontUseCargoParallelTests = true;
|
||||
|
||||
checkFlags = with prev;
|
||||
lib.optionals stdenv.isDarwin [
|
||||
"--skip=test_diff_same_non_empty_file"
|
||||
];
|
||||
|
||||
meta.mainProgram = "delta";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
{...}: {
|
||||
broken-packages = import ./broken-packages;
|
||||
xdg-desktop-portal-kde = import ./xdg-desktop-portal-kde;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue