mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-02 21:10:08 +00:00
Compare commits
386 Commits
nixpkgs-un
...
nixos-unst
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c59305bab2 | ||
|
|
1e867c1c02 | ||
|
|
a04263973d | ||
|
|
36004bea56 | ||
|
|
b68519a94b | ||
|
|
72942e8282 | ||
|
|
9659022e53 | ||
|
|
b9974feaa1 | ||
|
|
f2e16882cd | ||
|
|
f0800f94a4 | ||
|
|
d689564de6 | ||
|
|
135cc0efce | ||
|
|
485be3b78f | ||
|
|
cc4eee3567 | ||
|
|
4418f52a03 | ||
|
|
df2eb5d3be | ||
|
|
c01c3be3d2 | ||
|
|
4d236f20fa | ||
|
|
9d5955f32d | ||
|
|
6dff1ae283 | ||
|
|
47322a6423 | ||
|
|
534aec4191 | ||
|
|
4aacfab019 | ||
|
|
cf3e310274 | ||
|
|
b67745279f | ||
|
|
49c3c232cb | ||
|
|
5c1be6e928 | ||
|
|
cfea30e4a4 | ||
|
|
38fbe123b1 | ||
|
|
3eedeb7471 | ||
|
|
61472c3f9a | ||
|
|
d1e2e1c716 | ||
|
|
c7af65c897 | ||
|
|
292cbe88bc | ||
|
|
9db3683c7c | ||
|
|
4bab8c18a8 | ||
|
|
ec859d84f9 | ||
|
|
5ef0167023 | ||
|
|
6adc84c093 | ||
|
|
6587302f5b | ||
|
|
c1b155b14a | ||
|
|
9321e89b62 | ||
|
|
bfb2ad15f5 | ||
|
|
f5ac1875c3 | ||
|
|
a6e9ce3304 | ||
|
|
6da04a63ee | ||
|
|
1f91a37ec2 | ||
|
|
609af52166 | ||
|
|
a20dfbb8fd | ||
|
|
acbaa374d2 | ||
|
|
fb39e67369 | ||
|
|
f76e3b1048 | ||
|
|
79e1e05ae2 | ||
|
|
53812f71d5 | ||
|
|
af08143876 | ||
|
|
a00f4f9841 | ||
|
|
cfc2b815f4 | ||
|
|
9054f249ae | ||
|
|
a7e4a839fe | ||
|
|
66afb1e1aa | ||
|
|
dbe23b0c9c | ||
|
|
f4c012c7b9 | ||
|
|
432507c69b | ||
|
|
bfc0335085 | ||
|
|
cf368b196b | ||
|
|
7ec17fa347 | ||
|
|
7ebf8b2b26 | ||
|
|
a6b0885100 | ||
|
|
2589e49d13 | ||
|
|
8f53440263 | ||
|
|
870088b403 | ||
|
|
6b2e856646 | ||
|
|
c64da87873 | ||
|
|
18a06ab6ce | ||
|
|
a13e69ca30 | ||
|
|
1a53d97a7f | ||
|
|
16be726cf1 | ||
|
|
9aec7e2f4a | ||
|
|
a3710ddaf2 | ||
|
|
3b316e966b | ||
|
|
59ae40c57a | ||
|
|
5b7b3c1356 | ||
|
|
38d8fa8c20 | ||
|
|
0f5a5ad514 | ||
|
|
044fc31468 | ||
|
|
af6d987d93 | ||
|
|
5d6eee547a | ||
|
|
af6dc022d3 | ||
|
|
4099e13ae4 | ||
|
|
aaa6377143 | ||
|
|
09bff633b2 | ||
|
|
6548b0dbc0 | ||
|
|
601dfd666a | ||
|
|
4a71688f20 | ||
|
|
fc9d9f3fb2 | ||
|
|
fc872bf294 | ||
|
|
59e9ed2946 | ||
|
|
229f2ff86a | ||
|
|
27389bf4b5 | ||
|
|
f54271b1be | ||
|
|
bd102acb21 | ||
|
|
0656a3c4ac | ||
|
|
60f1dbabaa | ||
|
|
7c8bf3a826 | ||
|
|
9d8d4869e5 | ||
|
|
e704142399 | ||
|
|
1d54a047c6 | ||
|
|
0c3e85a164 | ||
|
|
0874fd8b50 | ||
|
|
c49deb638d | ||
|
|
0462fa161a | ||
|
|
9768e27870 | ||
|
|
1feb48bb0f | ||
|
|
df97fbdfb4 | ||
|
|
5ce79c4596 | ||
|
|
e38863e35d | ||
|
|
05100e1c8e | ||
|
|
086acd5499 | ||
|
|
b1e0f329ec | ||
|
|
1eea076de0 | ||
|
|
9305c8ddde | ||
|
|
b843292158 | ||
|
|
3dead37bf8 | ||
|
|
49ac18c855 | ||
|
|
a9d714f3f0 | ||
|
|
ee734d6256 | ||
|
|
ab461358c6 | ||
|
|
4cb74c80df | ||
|
|
b1d6406f4f | ||
|
|
c7d46bae58 | ||
|
|
4890e742b5 | ||
|
|
f49cd57001 | ||
|
|
4f03eeaadc | ||
|
|
341796ce8f | ||
|
|
c73965f70d | ||
|
|
6a64f5c116 | ||
|
|
d5fa2b78c1 | ||
|
|
affbc06c23 | ||
|
|
d016e05d21 | ||
|
|
f83afc2439 | ||
|
|
52346601fb | ||
|
|
ef9c4d8169 | ||
|
|
4e208c063f | ||
|
|
d29a8de3c3 | ||
|
|
440edf3cc1 | ||
|
|
398068668f | ||
|
|
680bb4ee24 | ||
|
|
bd6b41ee85 | ||
|
|
8aa5d3cef1 | ||
|
|
4ceb0e52d5 | ||
|
|
709cf3d4e3 | ||
|
|
755c577f58 | ||
|
|
326f55e1c6 | ||
|
|
2d1f9d9bcf | ||
|
|
804af16f3e | ||
|
|
144eeedabd | ||
|
|
291362e2e0 | ||
|
|
f3b35b9246 | ||
|
|
f047f6ec14 | ||
|
|
891f33aa3d | ||
|
|
6fcdb2e788 | ||
|
|
138fbf4718 | ||
|
|
5888949222 | ||
|
|
110f120ea5 | ||
|
|
b08872bc81 | ||
|
|
e2c3933cbd | ||
|
|
ec04c0e4c9 | ||
|
|
9afb3fc9f7 | ||
|
|
d52bb33207 | ||
|
|
bab0dbd1ce | ||
|
|
79076e3f9c | ||
|
|
33febfda9a | ||
|
|
9bb809ac35 | ||
|
|
8b6af1804c | ||
|
|
7c7582ea64 | ||
|
|
fa10d1c959 | ||
|
|
e76feb331c | ||
|
|
10c788148e | ||
|
|
bfa9c16d49 | ||
|
|
455008876b | ||
|
|
ecd20c3460 | ||
|
|
c1c2946c3a | ||
|
|
277383a833 | ||
|
|
a12ea01516 | ||
|
|
173f7fc3fa | ||
|
|
603cd04dfd | ||
|
|
2b63fe5304 | ||
|
|
e9f80ab297 | ||
|
|
bda239205b | ||
|
|
bb81602085 | ||
|
|
a02a6480a0 | ||
|
|
803c63ce3b | ||
|
|
f40cd09974 | ||
|
|
c8e3e8a598 | ||
|
|
b8e5835552 | ||
|
|
f238bd7513 | ||
|
|
0aeaeb2253 | ||
|
|
d15b3f696c | ||
|
|
49bb14a5f3 | ||
|
|
42c9cad1ec | ||
|
|
e98a467dab | ||
|
|
4bce8e1ed9 | ||
|
|
372f69a9c4 | ||
|
|
d6f1e2c9d0 | ||
|
|
800bd6f650 | ||
|
|
e8813f22ed | ||
|
|
a46a18816e | ||
|
|
eb90c3b8f2 | ||
|
|
4962f2d6d5 | ||
|
|
3af213b5a6 | ||
|
|
5a5b0aa600 | ||
|
|
e732aaf210 | ||
|
|
0ef6b6f388 | ||
|
|
2de3c9895b | ||
|
|
d922ce5250 | ||
|
|
63eb9d82d1 | ||
|
|
07f0e5db55 | ||
|
|
594f8e596d | ||
|
|
806a920726 | ||
|
|
0b81be43e2 | ||
|
|
c207f1a7b1 | ||
|
|
72f58cfa77 | ||
|
|
b1f2f375fa | ||
|
|
5f10e0549a | ||
|
|
b5901c187c | ||
|
|
47253900a0 | ||
|
|
2a94a9f82a | ||
|
|
189bcd9c5c | ||
|
|
d60c5e9fef | ||
|
|
4d5e89e28c | ||
|
|
ce22b64653 | ||
|
|
de23aebb42 | ||
|
|
43a2fd300a | ||
|
|
7e860ef08a | ||
|
|
e25d6c3638 | ||
|
|
d109bd22fb | ||
|
|
388535e059 | ||
|
|
cf46d0f3be | ||
|
|
bfa41ffc6e | ||
|
|
dbe2add365 | ||
|
|
953ebb0f45 | ||
|
|
47aaeca723 | ||
|
|
2ea142e3a8 | ||
|
|
d714d704f2 | ||
|
|
2af0f2d73e | ||
|
|
2b560e764a | ||
|
|
aaabf0623c | ||
|
|
1f25d7abd3 | ||
|
|
ae74e87035 | ||
|
|
6806b0d3e3 | ||
|
|
b6b71dd130 | ||
|
|
2f8d6e82f3 | ||
|
|
03befd6377 | ||
|
|
1cf2145e54 | ||
|
|
d225913b21 | ||
|
|
78f3382643 | ||
|
|
c4878dda49 | ||
|
|
0f882e9f46 | ||
|
|
38358d0dff | ||
|
|
9854a0651d | ||
|
|
9d84a6f24f | ||
|
|
c155d2b033 | ||
|
|
892ac85e4e | ||
|
|
d7cc42f4ac | ||
|
|
915df4a976 | ||
|
|
2cbca4a651 | ||
|
|
7d4d3a3cf6 | ||
|
|
177ee7fec0 | ||
|
|
80a41501f6 | ||
|
|
3243017710 | ||
|
|
f62799aa03 | ||
|
|
1929e7b49e | ||
|
|
f5c9bd8178 | ||
|
|
e9a5f00a12 | ||
|
|
b1ca8488d1 | ||
|
|
79e35304e0 | ||
|
|
278d7af4f7 | ||
|
|
aa1d730bc2 | ||
|
|
677492685e | ||
|
|
756725c6b7 | ||
|
|
86431f2e9c | ||
|
|
f5845d682b | ||
|
|
cd9d3a7258 | ||
|
|
f96a72bb58 | ||
|
|
a2df7f100b | ||
|
|
fbfd403612 | ||
|
|
eb156706cb | ||
|
|
63c134f377 | ||
|
|
d1c5644dae | ||
|
|
d1dcf130e3 | ||
|
|
fd0a757dc5 | ||
|
|
5ed3d50c67 | ||
|
|
6879371c1d | ||
|
|
63a7efe4dc | ||
|
|
7c37200627 | ||
|
|
9c8fe8c251 | ||
|
|
93ccc9466d | ||
|
|
06ddc31796 | ||
|
|
4f1eda08bf | ||
|
|
9c03d80069 | ||
|
|
b3df68f214 | ||
|
|
0486bb1afd | ||
|
|
8f96a27d24 | ||
|
|
ca282c0458 | ||
|
|
32ec119e11 | ||
|
|
afb2d5a489 | ||
|
|
ded19e57ad | ||
|
|
d9f82ce064 | ||
|
|
40bf9d4cbe | ||
|
|
b56663298f | ||
|
|
cd5b81df23 | ||
|
|
e78302f9b1 | ||
|
|
2192aa4ab8 | ||
|
|
f30e5938e4 | ||
|
|
d32e20959f | ||
|
|
a132ad5019 | ||
|
|
d1ec6c287b | ||
|
|
d54e113fdc | ||
|
|
ac694b8282 | ||
|
|
7441ff7701 | ||
|
|
64be24d790 | ||
|
|
995b9383a5 | ||
|
|
3f1c829e39 | ||
|
|
7d272b1761 | ||
|
|
ce55199fef | ||
|
|
8ac8ddd1a7 | ||
|
|
88accc0c92 | ||
|
|
78805715a6 | ||
|
|
0f59a83e3b | ||
|
|
dab18b461b | ||
|
|
3e1e03947f | ||
|
|
a1fd1fc75c | ||
|
|
dc9866aa4c | ||
|
|
9e4e2e6bad | ||
|
|
e8aa8e8833 | ||
|
|
89b1f80d92 | ||
|
|
ae94a18fe5 | ||
|
|
f19fd61b36 | ||
|
|
bdb05692c0 | ||
|
|
363bf9457f | ||
|
|
4e85f56411 | ||
|
|
6298fa976d | ||
|
|
f677033e78 | ||
|
|
2ebbbd5b5f | ||
|
|
8e0068e56f | ||
|
|
f70bc6442d | ||
|
|
c02d3963a3 | ||
|
|
0d23a800a0 | ||
|
|
44086e4273 | ||
|
|
caffa3c21d | ||
|
|
9983fb334d | ||
|
|
6fd76491e3 | ||
|
|
7dffed1ecb | ||
|
|
edb1620b2b | ||
|
|
e5ccacd0f5 | ||
|
|
9fb2543503 | ||
|
|
c8e25ed8a2 | ||
|
|
80de0d3c28 | ||
|
|
7d304367f4 | ||
|
|
58928e2173 | ||
|
|
cc4c84c2fc | ||
|
|
04648a05e7 | ||
|
|
4fcbf7a99d | ||
|
|
350649f1a1 | ||
|
|
d2ac1309ec | ||
|
|
5fd0bc107e | ||
|
|
e4b9267fa1 | ||
|
|
6a074f8114 | ||
|
|
d3f13e3324 | ||
|
|
63bb1ff4fd | ||
|
|
463c555138 | ||
|
|
9b72e9b240 | ||
|
|
85449ed2ad | ||
|
|
2365918156 | ||
|
|
e3a71eb802 | ||
|
|
48c5b1fd75 | ||
|
|
399c923255 | ||
|
|
35b61adb55 | ||
|
|
690b0f4676 | ||
|
|
a2ded6ccbd | ||
|
|
9c21030dfd | ||
|
|
adbbf1e66e | ||
|
|
1a245e29f4 | ||
|
|
6ef062e2a3 | ||
|
|
519ddf2b0a | ||
|
|
2727137b71 |
@@ -1,7 +1,6 @@
|
||||
{ lib, ... }:
|
||||
rec {
|
||||
# Borrowed from https://github.com/NixOS/nixpkgs/pull/355616
|
||||
uniqueStrings = list: builtins.attrNames (builtins.groupBy lib.id list);
|
||||
inherit (lib) uniqueStrings;
|
||||
|
||||
/*
|
||||
Converts a `packagePlatformPath` into a `packagePlatformAttr`
|
||||
|
||||
@@ -699,20 +699,7 @@ rec {
|
||||
*/
|
||||
filterAttrsRecursive =
|
||||
pred: set:
|
||||
listToAttrs (
|
||||
concatMap (
|
||||
name:
|
||||
let
|
||||
v = set.${name};
|
||||
in
|
||||
if pred name v then
|
||||
[
|
||||
(nameValuePair name (if isAttrs v then filterAttrsRecursive pred v else v))
|
||||
]
|
||||
else
|
||||
[ ]
|
||||
) (attrNames set)
|
||||
);
|
||||
mapAttrs (_: v: if isAttrs v then filterAttrsRecursive pred v else v) (filterAttrs pred set);
|
||||
|
||||
/**
|
||||
Like [`lib.lists.foldl'`](#function-library-lib.lists.foldl-prime) but for attribute sets.
|
||||
@@ -1528,12 +1515,7 @@ rec {
|
||||
*/
|
||||
zipAttrsWithNames =
|
||||
names: f: sets:
|
||||
listToAttrs (
|
||||
map (name: {
|
||||
inherit name;
|
||||
value = f name (catAttrs name sets);
|
||||
}) names
|
||||
);
|
||||
genAttrs names (name: f name (catAttrs name sets));
|
||||
|
||||
/**
|
||||
Merge sets of attributes and use the function `f` to merge attribute values.
|
||||
|
||||
@@ -207,6 +207,8 @@
|
||||
|
||||
- The `jetty_11` package has been removed as it reached end of life. Use `jetty_12` instead.
|
||||
|
||||
- The postsrsd module now supports integrating with Postfix as a milter. The [](#opt-services.postsrsd.configurePostfix) option has become an enum to reflect the different integration options. Boolean values are deprecated and will be removed in NixOS 27.05. The previous default `true` is equivalent to `socketmap`.
|
||||
|
||||
- The Mullvad VPN service now has a separate toggle to enable the Mullvad VPN graphical user interface. If you have previously used Mullvad on a desktop by setting `services.mullvad-vpn.package` to `pkgs.mullvad-vpn`, you should now **unset that option**, and enable `services.mullvad-vpn.gui.enable`. The VPN will not work if `services.mullvad-vpn.package` is set to `pkgs.mullvad-vpn`, as `pkgs.mullvad-vpn` no longer contains the Mullvad Daemon; please ensure that `services.mullvad-vpn.package` is set to `pkgs.mullvad`, regardless if you plan to enable the graphical user interface or not.
|
||||
|
||||
- TUI command of `tracexec` now allocates a pseudo terminal by default. Use `--no-tty` to run without one and redirect the tracee's stdin, stdout, and
|
||||
|
||||
@@ -61,11 +61,10 @@ in
|
||||
#!${pkgs.runtimeShell}
|
||||
# Import environment variables
|
||||
${cfg.extraSessionCommands}
|
||||
# Setup systemd user environment
|
||||
systemctl --user import-environment DISPLAY WAYLAND_DISPLAY
|
||||
systemctl --user start dwl-session.target
|
||||
# Start dwl
|
||||
exec ${lib.getExe cfg.package}
|
||||
# Start dwl, then set up the systemd user environment once dwl
|
||||
# has actually set WAYLAND_DISPLAY (see dwl(1) -s), instead of
|
||||
# importing it before dwl exists.
|
||||
exec ${lib.getExe cfg.package} -s "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY; systemctl --user start dwl-session.target"
|
||||
'';
|
||||
mode = "0755"; # Make it executable
|
||||
};
|
||||
|
||||
@@ -30,6 +30,7 @@ let
|
||||
cosmic-launcher
|
||||
cosmic-notifications
|
||||
cosmic-osd
|
||||
cosmic-osk
|
||||
cosmic-panel
|
||||
cosmic-session
|
||||
cosmic-settings
|
||||
@@ -90,6 +91,7 @@ in
|
||||
cosmic-reader
|
||||
cosmic-screenshot
|
||||
cosmic-term
|
||||
cosmic-viewer
|
||||
cosmic-wallpapers
|
||||
cosmic-sound-theme
|
||||
glib
|
||||
@@ -134,6 +136,11 @@ in
|
||||
open-sans
|
||||
];
|
||||
|
||||
qt = {
|
||||
enable = lib.mkDefault true;
|
||||
platformTheme = lib.mkDefault "qt5ct";
|
||||
};
|
||||
|
||||
# Required options for the COSMIC DE
|
||||
environment.sessionVariables.X11_BASE_RULES_XML = "${config.services.xserver.xkb.dir}/rules/base.xml";
|
||||
environment.sessionVariables.X11_EXTRA_RULES_XML = "${config.services.xserver.xkb.dir}/rules/base.extras.xml";
|
||||
@@ -164,6 +171,7 @@ in
|
||||
hardware.system76.power-daemon.enable = lib.mkDefault (
|
||||
!config.services.power-profiles-daemon.enable && !config.services.tuned.enable
|
||||
);
|
||||
services.switcherooControl.enable = lib.mkDefault true;
|
||||
|
||||
warnings = lib.optionals (cfg.showExcludedPkgsWarning && excludedCorePkgs != [ ]) [
|
||||
''
|
||||
|
||||
@@ -90,8 +90,6 @@ let
|
||||
}) cfg.sieve.pipeBins
|
||||
);
|
||||
|
||||
yesOrNo = v: if v then "yes" else "no";
|
||||
|
||||
toOption =
|
||||
i: n: v:
|
||||
"${i}${toString n} = ${v}";
|
||||
@@ -103,7 +101,7 @@ let
|
||||
if isInt v then
|
||||
toString v
|
||||
else if isBool v then
|
||||
yesOrNo v
|
||||
lib.boolToYesNo v
|
||||
else if isString v then
|
||||
v
|
||||
else if isPath v || isDerivation v then
|
||||
|
||||
@@ -6,8 +6,6 @@
|
||||
}:
|
||||
let
|
||||
|
||||
concatMapLines = f: l: lib.concatStringsSep "\n" (map f l);
|
||||
|
||||
cfg = config.services.mlmmj;
|
||||
stateDir = "/var/lib/mlmmj";
|
||||
spoolDir = "/var/spool/mlmmj";
|
||||
@@ -141,10 +139,10 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
extraAliases = concatMapLines (alias cfg.listDomain) cfg.mailLists;
|
||||
extraAliases = lib.concatMapStringsSep "\n" (alias cfg.listDomain) cfg.mailLists;
|
||||
|
||||
virtual = concatMapLines (virtual cfg.listDomain) cfg.mailLists;
|
||||
transport = concatMapLines (transport cfg.listDomain) cfg.mailLists;
|
||||
virtual = lib.concatMapStringsSep "\n" (virtual cfg.listDomain) cfg.mailLists;
|
||||
transport = lib.concatMapStringsSep "\n" (transport cfg.listDomain) cfg.mailLists;
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.mlmmj ];
|
||||
@@ -165,7 +163,7 @@ in
|
||||
ExecStart = "${pkgs.mlmmj}/bin/mlmmj-maintd -F -d ${spoolDir}/${cfg.listDomain}";
|
||||
};
|
||||
preStart = ''
|
||||
${concatMapLines (createList cfg.listDomain) cfg.mailLists}
|
||||
${lib.concatMapStringsSep "\n" (createList cfg.listDomain) cfg.mailLists}
|
||||
${lib.getExe' config.services.postfix.package "postmap"} /etc/postfix/virtual
|
||||
${lib.getExe' config.services.postfix.package "postmap"} /etc/postfix/transport
|
||||
'';
|
||||
|
||||
@@ -244,8 +244,6 @@ in
|
||||
"noroot"
|
||||
"noroot-locked"
|
||||
];
|
||||
RuntimeDirectory = "postfix-tlspol";
|
||||
RuntimeDirectoryMode = "1750";
|
||||
WorkingDirectory = "/var/cache/postfix-tlspol";
|
||||
UMask = "0077";
|
||||
};
|
||||
|
||||
@@ -46,6 +46,14 @@ let
|
||||
configFile = pkgs.writeText "postsrsd.conf" (
|
||||
renderAttr (lib.filterAttrsRecursive (_: v: v != null) cfg.settings)
|
||||
);
|
||||
|
||||
postfixIntegration =
|
||||
if cfg.configurePostfix == true then
|
||||
"socketmap"
|
||||
else if cfg.configurePostfix == false then
|
||||
"none"
|
||||
else
|
||||
cfg.configurePostfix;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
@@ -122,6 +130,15 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
milter = lib.mkOption {
|
||||
type = with lib.types; nullOr (strMatching "^(unix|inet):.+");
|
||||
default = "unix:/run/postsrsd/milter";
|
||||
example = "inet:localhost:9997";
|
||||
description = ''
|
||||
Milter listener configuration in `unix:/path/to/socket` or `inet:host:port` format.
|
||||
'';
|
||||
};
|
||||
|
||||
secrets-file = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "\${CREDENTIALS_DIRECTORY}/secrets-file";
|
||||
@@ -168,11 +185,11 @@ in
|
||||
};
|
||||
|
||||
socketmap = lib.mkOption {
|
||||
type = lib.types.strMatching "^(unix|inet):.+";
|
||||
default = "unix:/run/postsrsd/socket";
|
||||
type = with lib.types; nullOr (strMatching "^(unix|inet):.+");
|
||||
default = "unix:/run/postsrsd/socketmap";
|
||||
example = "inet:localhost:10003";
|
||||
description = ''
|
||||
Listener configuration in socket map format native to Postfix configuration.
|
||||
Socketmap listener configuration in `unix:/path/to/socket` or `inet:host:port` format.
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -212,10 +229,23 @@ in
|
||||
};
|
||||
|
||||
configurePostfix = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
type = lib.types.enum [
|
||||
true
|
||||
false
|
||||
"none"
|
||||
"socketmap"
|
||||
"milter"
|
||||
];
|
||||
default = "socketmap";
|
||||
example = "milter";
|
||||
description = ''
|
||||
Whether to configure the required settings to use postsrsd in the local Postfix instance.
|
||||
Whether and how to integrate postsrsd into the local Postfix instance.
|
||||
|
||||
::: {.caution}
|
||||
Boolean values are deprecated and retained for backwards
|
||||
compatibility. `true` is equivalent to `socketmap`, and `false` is
|
||||
equivalent to `none`.
|
||||
:::
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -234,17 +264,41 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkMerge [
|
||||
(lib.mkIf (cfg.enable && cfg.configurePostfix && config.services.postfix.enable) {
|
||||
services.postfix.settings.main = {
|
||||
# https://github.com/roehling/postsrsd#configuration
|
||||
sender_canonical_maps = "socketmap:${cfg.settings.socketmap}:forward";
|
||||
sender_canonical_classes = "envelope_sender";
|
||||
recipient_canonical_maps = "socketmap:${cfg.settings.socketmap}:reverse";
|
||||
recipient_canonical_classes = [
|
||||
"envelope_recipient"
|
||||
"header_recipient"
|
||||
];
|
||||
};
|
||||
{
|
||||
warnings = lib.optionals (cfg.enable && isBool cfg.configurePostfix) [
|
||||
''
|
||||
Boolean values are deprecated for `services.postsrsd.configurePostfix` and will be rejected in NixOS 27.05.
|
||||
Use `none`, `socketmap`, or `milter` instead. `true` is equivalent to `socketmap` and `false` is equivalent to `none`.
|
||||
''
|
||||
];
|
||||
}
|
||||
(lib.mkIf (cfg.enable && postfixIntegration != "none" && config.services.postfix.enable) {
|
||||
assertions = [
|
||||
{
|
||||
assertion = postfixIntegration == "milter" -> cfg.settings.milter != null;
|
||||
message = "Configuring Postfix `smtpd_milters` requires `services.postsrsd.settings.milter` to be set.";
|
||||
}
|
||||
{
|
||||
assertion = postfixIntegration == "socketmap" -> cfg.settings.socketmap != null;
|
||||
message = "Configuring Postfix canonical maps requires `services.postsrsd.settings.socketmap` to be set.";
|
||||
}
|
||||
];
|
||||
|
||||
services.postfix.settings.main =
|
||||
lib.optionalAttrs (postfixIntegration == "socketmap") {
|
||||
# https://github.com/roehling/postsrsd#configuration
|
||||
sender_canonical_maps = "socketmap:${cfg.settings.socketmap}:forward";
|
||||
sender_canonical_classes = "envelope_sender";
|
||||
recipient_canonical_maps = "socketmap:${cfg.settings.socketmap}:reverse";
|
||||
recipient_canonical_classes = [
|
||||
"envelope_recipient"
|
||||
"header_recipient"
|
||||
];
|
||||
}
|
||||
// lib.optionalAttrs (postfixIntegration == "milter") {
|
||||
# https://github.com/roehling/postsrsd/tree/main#milter-support
|
||||
smtpd_milters = [ cfg.settings.milter ];
|
||||
};
|
||||
|
||||
users.users.postfix.extraGroups = [ cfg.group ];
|
||||
})
|
||||
|
||||
@@ -113,20 +113,7 @@ let
|
||||
filterAttrsListRecursive =
|
||||
pred: x:
|
||||
if isAttrs x then
|
||||
listToAttrs (
|
||||
concatMap (
|
||||
name:
|
||||
let
|
||||
v = x.${name};
|
||||
in
|
||||
if pred name v then
|
||||
[
|
||||
(nameValuePair name (filterAttrsListRecursive pred v))
|
||||
]
|
||||
else
|
||||
[ ]
|
||||
) (attrNames x)
|
||||
)
|
||||
mapAttrs (_: filterAttrsListRecursive pred) (filterAttrs pred x)
|
||||
else if isList x then
|
||||
map (filterAttrsListRecursive pred) x
|
||||
else
|
||||
|
||||
@@ -21,8 +21,6 @@ let
|
||||
(listOf settingType)
|
||||
];
|
||||
|
||||
genAttrs' = names: f: lib.listToAttrs (map f names);
|
||||
|
||||
regexEscape =
|
||||
let
|
||||
# taken from https://github.com/python/cpython/blob/05cb728d68a278d11466f9a6c8258d914135c96c/Lib/re.py#L251-L266
|
||||
@@ -300,7 +298,7 @@ in
|
||||
lib.mapAttrsToList (name: cfg: {
|
||||
${cfg.nginx.virtualHost} = {
|
||||
locations =
|
||||
(genAttrs' [ "cgit.css" "cgit.js" "cgit.png" "favicon.ico" "robots.txt" ] (
|
||||
(lib.genAttrs' [ "cgit.css" "cgit.js" "cgit.png" "favicon.ico" "robots.txt" ] (
|
||||
fileName:
|
||||
lib.nameValuePair "= ${stripLocation cfg}/${fileName}" {
|
||||
alias = lib.mkDefault "${cfg.package}/cgit/${fileName}";
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
let
|
||||
cfg = config.services.cloudflare-ddns;
|
||||
|
||||
boolToString = b: if b then "true" else "false";
|
||||
formatList = l: lib.concatStringsSep "," l;
|
||||
in
|
||||
{
|
||||
@@ -265,7 +264,7 @@ in
|
||||
let
|
||||
toEnv = name: value: "${name}=\"${toString value}\"";
|
||||
toEnvList = name: value: "${name}=\"${formatList value}\"";
|
||||
toEnvBool = name: value: "${name}=\"${boolToString value}\"";
|
||||
toEnvBool = name: value: "${name}=\"${lib.boolToString value}\"";
|
||||
toEnvMaybe =
|
||||
pred: name: value:
|
||||
lib.optionalString pred (toEnv name value);
|
||||
|
||||
@@ -20,6 +20,24 @@ in
|
||||
default = null;
|
||||
description = "Portal to discover targets on";
|
||||
};
|
||||
|
||||
discoverType = mkOption {
|
||||
description = ''
|
||||
Target discovery type.
|
||||
Change this if you want to discover your targes via an iSNS server
|
||||
or use the targets provided via firmware settings.
|
||||
See {manpage}`iscsiadm(8)`.
|
||||
'';
|
||||
default = "sendtargets";
|
||||
example = "sendtargets";
|
||||
type = enum [
|
||||
"st"
|
||||
"sendtargets"
|
||||
"isns"
|
||||
"fw"
|
||||
];
|
||||
};
|
||||
|
||||
name = mkOption {
|
||||
type = str;
|
||||
description = "Name of this iscsi initiator";
|
||||
@@ -81,7 +99,7 @@ in
|
||||
wantedBy = [ "remote-fs.target" ];
|
||||
serviceConfig.ExecStartPre =
|
||||
mkIf (cfg.discoverPortal != null)
|
||||
"${cfg.package}/bin/iscsiadm --mode discoverydb --type sendtargets --portal ${escapeShellArg cfg.discoverPortal} --discover";
|
||||
"${cfg.package}/bin/iscsiadm --mode discoverydb --type ${cfg.discoverType} --portal ${escapeShellArg cfg.discoverPortal} --discover";
|
||||
};
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
@@ -43,6 +43,23 @@ in
|
||||
type = nullOr str;
|
||||
};
|
||||
|
||||
discoverType = mkOption {
|
||||
description = ''
|
||||
Target discovery type.
|
||||
Change this if you want to discover your targes via an iSNS server
|
||||
or use the targets provided via firmware settings.
|
||||
See {manpage}`iscsiadm(8)`.
|
||||
'';
|
||||
default = "sendtargets";
|
||||
example = "sendtargets";
|
||||
type = enum [
|
||||
"st"
|
||||
"sendtargets"
|
||||
"isns"
|
||||
"fw"
|
||||
];
|
||||
};
|
||||
|
||||
target = mkOption {
|
||||
description = ''
|
||||
Name of the iSCSI target to boot from.
|
||||
@@ -168,7 +185,7 @@ in
|
||||
|
||||
iscsid --foreground --no-pid-file --debug ${toString cfg.logLevel} &
|
||||
iscsiadm --mode discoverydb \
|
||||
--type sendtargets \
|
||||
--type ${cfg.discoverType} \
|
||||
--discover \
|
||||
--portal ${escapeShellArg cfg.discoverPortal} \
|
||||
--debug ${toString cfg.logLevel}
|
||||
|
||||
@@ -85,12 +85,10 @@ rec {
|
||||
else
|
||||
f (path ++ [ name ]) name value;
|
||||
in
|
||||
mapAttrs'' g set;
|
||||
concatMapAttrs g set;
|
||||
in
|
||||
recurse [ ] set;
|
||||
|
||||
mapAttrs'' = f: set: foldl' (a: b: a // b) { } (mapAttrsToList f set);
|
||||
|
||||
# Extract the options from the given set of parameters.
|
||||
paramsToOptions = ps: mapParamsRecursive (_path: name: param: { ${name} = param.option; }) ps;
|
||||
|
||||
|
||||
@@ -16,10 +16,6 @@ let
|
||||
}:
|
||||
attrsOfAttrs:
|
||||
let
|
||||
# map function to string for each key val
|
||||
mapAttrsToStringsSep =
|
||||
sep: mapFn: attrs:
|
||||
lib.concatStringsSep sep (lib.mapAttrsToList mapFn attrs);
|
||||
mkSection =
|
||||
sectName: sectValues:
|
||||
''
|
||||
@@ -29,7 +25,7 @@ let
|
||||
+ "}";
|
||||
in
|
||||
# map input to ini sections
|
||||
mapAttrsToStringsSep "\n" mkSection attrsOfAttrs;
|
||||
lib.concatMapAttrsStringSep "\n" mkSection attrsOfAttrs;
|
||||
|
||||
configFile = pkgs.writeText "manticore.conf" (
|
||||
toSphinx {
|
||||
|
||||
@@ -171,25 +171,33 @@ in
|
||||
serviceConfig =
|
||||
let
|
||||
btrfsCmd = getExe pkgs.btrfs-progs;
|
||||
btrfsCancelCmd = pkgs.writers.writePython3 "btrfs-scrub-maybe-cancel" { } ''
|
||||
import subprocess
|
||||
import sys
|
||||
btrfsCancelCmd =
|
||||
pkgs.writers.writePython3 "btrfs-scrub-maybe-cancel"
|
||||
{
|
||||
flakeIgnore = [
|
||||
# `btrfsCmd` may exceed 80-character line length for some platforms
|
||||
"E501"
|
||||
];
|
||||
}
|
||||
''
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
btrfs = "${escape [ "\"" "\\" ] btrfsCmd}"
|
||||
result = subprocess.run(
|
||||
[btrfs, "scrub", "cancel"] + sys.argv[1:],
|
||||
stderr=subprocess.PIPE,
|
||||
check=False,
|
||||
shell=False
|
||||
)
|
||||
btrfs = "${escape [ "\"" "\\" ] btrfsCmd}"
|
||||
result = subprocess.run(
|
||||
[btrfs, "scrub", "cancel"] + sys.argv[1:],
|
||||
stderr=subprocess.PIPE,
|
||||
check=False,
|
||||
shell=False
|
||||
)
|
||||
|
||||
# ignore errors if there was no running scrub to cancel
|
||||
if result.returncode == 2:
|
||||
sys.exit(0)
|
||||
# ignore errors if there was no running scrub to cancel
|
||||
if result.returncode == 2:
|
||||
sys.exit(0)
|
||||
|
||||
sys.stderr.buffer.write(result.stderr)
|
||||
sys.exit(result.returncode)
|
||||
'';
|
||||
sys.stderr.buffer.write(result.stderr)
|
||||
sys.exit(result.returncode)
|
||||
'';
|
||||
additionalScrubArgs = optionals (cfgScrub.limit != null) [
|
||||
"--limit"
|
||||
cfgScrub.limit
|
||||
|
||||
@@ -9,25 +9,7 @@
|
||||
|
||||
;; Try to make tests cause no side-effects.
|
||||
|
||||
;;;; Tests that can be run in a batch Emacs
|
||||
|
||||
(ert-deftest with-packages-requested-packages-are-available ()
|
||||
(should (package-installed-p 'dash))
|
||||
(should (package-installed-p 'flx-ido)))
|
||||
|
||||
(ert-deftest with-packages-deps-of-requested-packages-are-available ()
|
||||
"Test https://github.com/NixOS/nixpkgs/issues/388829."
|
||||
(should (package-installed-p 'flx))
|
||||
(should (package-installed-p 'flx-ido)))
|
||||
|
||||
(ert-deftest with-packages-info-manual-of-requested-packages-is-available ()
|
||||
"Test https://debbugs.gnu.org/cgi/bugreport.cgi?bug=81105."
|
||||
;; `package-activate-all' makes package info manuals available.
|
||||
;; It is called at startup normally, but not in batch mode.
|
||||
;; We call it if needed to emulate the "normal" case.
|
||||
(unless package--activated
|
||||
(package-activate-all))
|
||||
(should (Info-find-file "dash" t)))
|
||||
;;;; Utils
|
||||
|
||||
(defun with-packages--nix-store-dir ()
|
||||
"Return nix store dir.
|
||||
@@ -56,6 +38,36 @@ which is generated by nix when building this elisp package."
|
||||
"Locate the natively-compiled LIBRARY file."
|
||||
(locate-eln-file (comp-el-to-eln-rel-filename (find-library-name library))))
|
||||
|
||||
(defun with-packages-unwrapped-site-start-is-loaded ()
|
||||
(fboundp 'nix--profile-paths))
|
||||
|
||||
(defun with-packages-eval-in-sub-emacs (form)
|
||||
"Evaluate FORM in a subprocess Emacs and return its result."
|
||||
(pcase-exhaustive
|
||||
(process-lines "emacs" "--batch"
|
||||
"--eval" (format "(prin1 %S)" form))
|
||||
(`(,result) (read result))))
|
||||
|
||||
;;;; Tests that can be run in a batch Emacs
|
||||
|
||||
(ert-deftest with-packages-requested-packages-are-available ()
|
||||
(should (package-installed-p 'dash))
|
||||
(should (package-installed-p 'flx-ido)))
|
||||
|
||||
(ert-deftest with-packages-deps-of-requested-packages-are-available ()
|
||||
"Test https://github.com/NixOS/nixpkgs/issues/388829."
|
||||
(should (package-installed-p 'flx))
|
||||
(should (package-installed-p 'flx-ido)))
|
||||
|
||||
(ert-deftest with-packages-info-manual-of-requested-packages-is-available ()
|
||||
"Test https://debbugs.gnu.org/cgi/bugreport.cgi?bug=81105."
|
||||
;; `package-activate-all' makes package info manuals available.
|
||||
;; It is called at startup normally, but not in batch mode.
|
||||
;; We call it if needed to emulate the "normal" case.
|
||||
(unless package--activated
|
||||
(package-activate-all))
|
||||
(should (Info-find-file "dash" t)))
|
||||
|
||||
(ert-deftest with-packages-aot-native-comp-eln-files-are-available ()
|
||||
(skip-unless (native-comp-available-p))
|
||||
(ert-info ("search eln files of Emacs proper")
|
||||
@@ -63,14 +75,27 @@ which is generated by nix when building this elisp package."
|
||||
(ert-info ("search eln files of requested packages")
|
||||
(should (with-packages--nix-store-file-p (with-packages--locate-eln-file "dash")))))
|
||||
|
||||
(defun with-packages-unwrapped-site-start-is-loaded ()
|
||||
(fboundp 'nix--profile-paths))
|
||||
|
||||
(ert-deftest with-packages-unwrapped-site-start-is-loaded ()
|
||||
(should (with-packages-unwrapped-site-start-is-loaded)))
|
||||
|
||||
(ert-deftest with-packages-bin-dirs-of-requested-packages-are-added-to-exec-path ()
|
||||
(should (executable-find "cowsay")))
|
||||
(ert-deftest with-packages-binaries-of-requested-packages-are-available ()
|
||||
(ert-info ("find binary via PATH")
|
||||
(should (equal (call-process-shell-command "cowsay") 0)))
|
||||
(ert-info ("find binary via exec-path")
|
||||
(should (executable-find "cowsay")))
|
||||
(ert-info ("each item is unique")
|
||||
(cl-flet ((item-should-be-unique (items)
|
||||
(should (equal items
|
||||
(cl-remove-duplicates items :test #'string=)))))
|
||||
(ert-info ("PATH of this Emacs")
|
||||
(item-should-be-unique (parse-colon-path (getenv "PATH"))))
|
||||
(ert-info ("PATH of sub-Emacs")
|
||||
(item-should-be-unique
|
||||
(parse-colon-path (with-packages-eval-in-sub-emacs '(getenv "PATH")))))
|
||||
(ert-info ("exec-path of this Emacs")
|
||||
(item-should-be-unique exec-path))
|
||||
(ert-info ("exec-path of sub-Emacs")
|
||||
(item-should-be-unique (with-packages-eval-in-sub-emacs 'exec-path))))))
|
||||
|
||||
(ert-deftest with-packages-tree-sitter-dir-is-added-to-treesit-extra-load-path ()
|
||||
(skip-unless (treesit-available-p))
|
||||
|
||||
@@ -171,16 +171,6 @@ runCommand (lib.appendToName "with-packages" emacs).name
|
||||
cat >"$siteStart" <<EOF
|
||||
;;; -*- lexical-binding: t -*-
|
||||
(load "$emacs/share/emacs/site-lisp/site-start" nil t)
|
||||
;; "$out/share/emacs/site-lisp" is added to load-path in wrapper.sh
|
||||
;; "$out/share/emacs/native-lisp" is added to native-comp-eln-load-path in wrapper.sh
|
||||
(add-to-list 'exec-path "$out/bin")
|
||||
;; Also expose extra package binaries via PATH so that subprocesses
|
||||
;; which rebuild their environment from PATH (e.g. direnv/envrc) can
|
||||
;; still find them. See https://github.com/purcell/envrc/issues/9
|
||||
(let ((deps-bin "$out/bin")
|
||||
(current-path (or (getenv "PATH") "")))
|
||||
(unless (member deps-bin (split-string current-path path-separator))
|
||||
(setenv "PATH" (concat deps-bin path-separator current-path))))
|
||||
${lib.optionalString withTreeSitter ''
|
||||
(add-to-list 'treesit-extra-load-path "$out/lib/")
|
||||
''}
|
||||
@@ -220,6 +210,7 @@ runCommand (lib.appendToName "with-packages" emacs).name
|
||||
--subst-var-by bash ${emacs.stdenv.shell} \
|
||||
--subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
|
||||
--subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \
|
||||
--subst-var-by wrapperBinDir "$deps/bin" \
|
||||
--subst-var-by wrapperInvocationDirectory "$out/bin/" \
|
||||
--subst-var-by wrapperInvocationName "$progname" \
|
||||
--subst-var prog
|
||||
@@ -246,6 +237,7 @@ runCommand (lib.appendToName "with-packages" emacs).name
|
||||
--subst-var-by bash ${emacs.stdenv.shell} \
|
||||
--subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
|
||||
--subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \
|
||||
--subst-var-by wrapperBinDir "$deps/bin" \
|
||||
--subst-var-by wrapperInvocationDirectory "$out/Applications/Emacs.app/Contents/MacOS/" \
|
||||
--subst-var-by wrapperInvocationName "Emacs" \
|
||||
--subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs"
|
||||
|
||||
@@ -53,4 +53,9 @@ export emacsWithPackages_siteLispNative=@wrapperSiteLispNative@
|
||||
export emacsWithPackages_invocationDirectory=@wrapperInvocationDirectory@
|
||||
export emacsWithPackages_invocationName=@wrapperInvocationName@
|
||||
|
||||
if [[ ${PATH-} != *"@wrapperBinDir@":* ]]
|
||||
then
|
||||
export PATH="@wrapperBinDir@${PATH:+:$PATH}"
|
||||
fi
|
||||
|
||||
exec @prog@ "$@"
|
||||
|
||||
@@ -2751,8 +2751,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "intellij-idea-keybindings";
|
||||
publisher = "k--kato";
|
||||
version = "1.7.7";
|
||||
hash = "sha256-+XF+Odb9nMKclQkB/lwFuVpCHlVq6LNG/gQATVBcrYc=";
|
||||
version = "1.7.8";
|
||||
hash = "sha256-771I7W5jrYVtN25N4jnKudPqhlX1ohGP5dI1vUciYXs=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/k--kato.intellij-idea-keybindings/changelog";
|
||||
|
||||
@@ -33,6 +33,8 @@ let
|
||||
"aarch64-darwin"
|
||||
];
|
||||
mainProgram = "sweethome3d";
|
||||
# last successful hydra build on darwin was in 2025
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
in
|
||||
{
|
||||
|
||||
@@ -93,8 +93,5 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
knownVulnerabilities = [
|
||||
"CVE-2023-26930"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -44,9 +44,7 @@ let
|
||||
|
||||
arch = mozillaPlatforms.${stdenv.hostPlatform.system};
|
||||
|
||||
isPrefixOf = prefix: string: builtins.substring 0 (builtins.stringLength prefix) string == prefix;
|
||||
|
||||
sourceMatches = locale: source: (isPrefixOf source.locale locale) && source.arch == arch;
|
||||
sourceMatches = locale: source: (lib.hasPrefix source.locale locale) && source.arch == arch;
|
||||
|
||||
policies = {
|
||||
DisableAppUpdate = true;
|
||||
|
||||
@@ -679,13 +679,13 @@
|
||||
"vendorHash": "sha256-hfSLa5MrrQ0JFZntykbU33TQnuAoYYFasOzUOzi1RV8="
|
||||
},
|
||||
"hashicorp_time": {
|
||||
"hash": "sha256-kdCdph+H3fWizMh+7AGBEscKpCwP7naj+3NSmPK25Us=",
|
||||
"hash": "sha256-7els7FaCojWzXp+0YP9YYJTAKS2PqpR1SMC1WxsfVb0=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/time",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-time",
|
||||
"rev": "v0.14.1",
|
||||
"rev": "v0.14.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-pIuZNark35Aqstd2hDf5QGmegzfFa439+5zI/qBsWLA="
|
||||
"vendorHash": "sha256-t20uPPaKr43Al7ExOPD+cw1hVwaVwxljHHR0tVPmrYw="
|
||||
},
|
||||
"hashicorp_tls": {
|
||||
"hash": "sha256-lUaVcnN+1Siz78XqrPLUlpUPRNLzp1VtWxgZEysL3pM=",
|
||||
|
||||
@@ -46,9 +46,7 @@ let
|
||||
|
||||
arch = mozillaPlatforms.${stdenv.hostPlatform.system} or throwSystem;
|
||||
|
||||
isPrefixOf = prefix: string: builtins.substring 0 (builtins.stringLength prefix) string == prefix;
|
||||
|
||||
sourceMatches = locale: source: (isPrefixOf source.locale locale) && source.arch == arch;
|
||||
sourceMatches = locale: source: (lib.hasPrefix source.locale locale) && source.arch == arch;
|
||||
|
||||
defaultSource = lib.findFirst (sourceMatches "en-US") { } sources;
|
||||
|
||||
|
||||
@@ -154,6 +154,7 @@ let
|
||||
|
||||
patches = [
|
||||
./fix-plugin-copy.patch
|
||||
./fix-plugin-updater-cxx20.patch
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
Backported from upstream commit a2d5c363b5e457ed842971d68f8b945247cc4a04
|
||||
("REFAC(plugin): Add constructors to UpdateEntry struct"), which landed on
|
||||
master but was never backported to the 1.5.x branch. Adjusted for the
|
||||
member ordering used in 1.5.x.
|
||||
|
||||
UpdateEntry declares a defaulted default constructor, which keeps it an
|
||||
aggregate under C++17 but not under C++20, so the brace-enclosed initialiser
|
||||
below stops compiling. abseil-cpp exports cxx_std_20 as an interface compile
|
||||
feature and protobuf::libprotobuf propagates it, which raises the standard used
|
||||
for the client targets above the C++17 requested via CMAKE_CXX_STANDARD.
|
||||
|
||||
--- a/src/mumble/PluginUpdater.h
|
||||
+++ b/src/mumble/PluginUpdater.h
|
||||
@@ -29,6 +29,8 @@
|
||||
/// the same plugin.
|
||||
struct UpdateEntry {
|
||||
UpdateEntry() = default;
|
||||
+ explicit UpdateEntry(plugin_id_t id, const QUrl &url, const QString &name, int redirectCount = 0)
|
||||
+ : pluginID(id), updateURL(url), fileName(name), redirects(redirectCount) {}
|
||||
|
||||
plugin_id_t pluginID = std::numeric_limits< plugin_id_t >::max();
|
||||
QUrl updateURL;
|
||||
--- a/src/mumble/PluginUpdater.cpp
|
||||
+++ b/src/mumble/PluginUpdater.cpp
|
||||
@@ -45,8 +45,7 @@
|
||||
QUrl updateURL = plugin->getUpdateDownloadURL();
|
||||
|
||||
if (updateURL.isValid() && !updateURL.isEmpty() && !updateURL.fileName().isEmpty()) {
|
||||
- UpdateEntry entry = { plugin->getID(), updateURL, updateURL.fileName(), 0 };
|
||||
- m_pluginsToUpdate << entry;
|
||||
+ m_pluginsToUpdate.append(UpdateEntry(plugin->getID(), updateURL, updateURL.fileName()));
|
||||
}
|
||||
}
|
||||
|
||||
33
pkgs/build-support/fetchrepoproject/tests.nix
Normal file
33
pkgs/build-support/fetchrepoproject/tests.nix
Normal file
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
testers,
|
||||
fetchRepoProject,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
# fetch repo by git rev
|
||||
manifest-demo-by-rev = testers.invalidateFetcherByDrvHash fetchRepoProject {
|
||||
name = "manifest-demo-git-repo-by-rev";
|
||||
manifest = "https://github.com/iayanpahwa/manifest-demo.git";
|
||||
rev = "6f731a3dd689d58333e53e259cd3b7d2242a4dc8";
|
||||
hash = "sha256-cMEvM9lqi8Zl/cFLnTHYv/VVxTzBTHkvhs+jp5U7M/g=";
|
||||
};
|
||||
|
||||
# fetch repo by tag
|
||||
sel4test-by-tag = testers.invalidateFetcherByDrvHash fetchRepoProject {
|
||||
name = "sel4test-by-tag";
|
||||
manifest = "https://github.com/seL4/sel4test-manifest.git";
|
||||
rev = "refs/tags/16.0.0";
|
||||
hash = "sha256-W2vOPWpbcgYPdo+Ife2ddFi3Xpe5Q9jjYqUJd31NQBA=";
|
||||
};
|
||||
|
||||
# use different manifest in repo
|
||||
sel4test-manifestName = testers.invalidateFetcherByDrvHash fetchRepoProject {
|
||||
name = "sel4refos-manifestName";
|
||||
manifest = "https://github.com/seL4/refos-manifest.git";
|
||||
rev = "ccb3225268ec9802a7a23b1d3e1b193067484741";
|
||||
manifestName = "working.xml";
|
||||
hash = "sha256-p/pqSkmWMtTXFg5ABgGcScXczF2rzuL1Vz4/v14OrZs=";
|
||||
};
|
||||
}
|
||||
@@ -17,15 +17,13 @@ let
|
||||
head
|
||||
isList
|
||||
length
|
||||
optionals
|
||||
optionalString
|
||||
pathExists
|
||||
readFile
|
||||
removePrefix
|
||||
replaceStrings
|
||||
stringLength
|
||||
stringToCharacters
|
||||
sub
|
||||
substring
|
||||
toList
|
||||
trace
|
||||
;
|
||||
@@ -88,19 +86,11 @@ rec {
|
||||
let
|
||||
special = "^$.+{}()";
|
||||
escs = "\\*?";
|
||||
splitString =
|
||||
let
|
||||
recurse =
|
||||
str:
|
||||
[ (substring 0 1 str) ] ++ (optionals (str != "") (recurse (substring 1 (stringLength str) str)));
|
||||
in
|
||||
str: recurse str;
|
||||
chars = s: filter (c: c != "" && !isList c) (splitString s);
|
||||
escape = s: map (c: "\\" + c) (chars s);
|
||||
escape = s: map (c: "\\" + c) (stringToCharacters s);
|
||||
in
|
||||
replaceStrings
|
||||
(
|
||||
(chars special)
|
||||
(stringToCharacters special)
|
||||
++ (escape escs)
|
||||
++ [
|
||||
"**/"
|
||||
|
||||
@@ -48,6 +48,7 @@ let
|
||||
attrValues
|
||||
mapAttrs
|
||||
filter
|
||||
getAttrs
|
||||
hasAttr
|
||||
mapAttrsToList
|
||||
;
|
||||
@@ -169,12 +170,7 @@ let
|
||||
drv: references:
|
||||
let
|
||||
rewrittenReferences = filter (dep: dep != drv && toString rewriteMemo.${dep} != dep) references;
|
||||
rewrites = listToAttrs (
|
||||
map (reference: {
|
||||
name = reference;
|
||||
value = rewriteMemo.${reference};
|
||||
}) rewrittenReferences
|
||||
);
|
||||
rewrites = getAttrs rewrittenReferences rewriteMemo;
|
||||
in
|
||||
replaceDirectDependencies {
|
||||
drv = storePathOrKnownTargetDerivationMemo.${drv};
|
||||
|
||||
@@ -877,12 +877,16 @@ rec {
|
||||
*/
|
||||
writeNu =
|
||||
name: argsOrScript:
|
||||
# Separate the shebang from doc comments attached to `main`.
|
||||
if lib.isAttrs argsOrScript && !lib.isDerivation argsOrScript then
|
||||
script:
|
||||
makeScriptWriter (
|
||||
argsOrScript // { interpreter = "${lib.getExe pkgs.nushell} --no-config-file"; }
|
||||
) name
|
||||
) name "\n${script}"
|
||||
else
|
||||
makeScriptWriter { interpreter = "${lib.getExe pkgs.nushell} --no-config-file"; } name argsOrScript;
|
||||
makeScriptWriter {
|
||||
interpreter = "${lib.getExe pkgs.nushell} --no-config-file";
|
||||
} name "\n${argsOrScript}";
|
||||
|
||||
/**
|
||||
Like writeScriptBin but the first line is a shebang to nu
|
||||
@@ -1198,10 +1202,8 @@ rec {
|
||||
interpreter =
|
||||
if libraries == [ ] then
|
||||
python.interpreter
|
||||
else if (lib.isFunction libraries) then
|
||||
(python.withPackages libraries).interpreter
|
||||
else
|
||||
(python.withPackages (ps: libraries)).interpreter;
|
||||
(python.withPackages (toFunction libraries)).interpreter;
|
||||
check = optionalString (python.isPy3k && doCheck) (
|
||||
writeDash "pythoncheck.sh" ''
|
||||
exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1"
|
||||
|
||||
@@ -254,6 +254,23 @@ recurseIntoAttrs {
|
||||
''
|
||||
);
|
||||
|
||||
nuDocComment =
|
||||
let
|
||||
script = writeNu "test-writers-nushell-doc-comment" ''
|
||||
# Doc comment example
|
||||
def main [] {}
|
||||
'';
|
||||
in
|
||||
runCommand "test-writers-nushell-doc-comment" { } ''
|
||||
${script} --help > help
|
||||
grep -F "Doc comment example" help
|
||||
if grep -F "#!" help; then
|
||||
echo "shebang included in Nushell doc comment" >&2
|
||||
exit 1
|
||||
fi
|
||||
touch $out
|
||||
'';
|
||||
|
||||
babashka = expectSuccess (
|
||||
writeBabashka "test-writers-babashka" { } ''
|
||||
(println "success")
|
||||
|
||||
@@ -16,6 +16,8 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "airplay-cli";
|
||||
# nixpkgs-update: no auto update
|
||||
# updated together with music-assistant
|
||||
version = "0.5.3";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "all-the-package-names";
|
||||
version = "2.0.2568";
|
||||
version = "2.0.2578";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nice-registry";
|
||||
repo = "all-the-package-names";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9Okp0Fli+MyVYqOQDg867ic/t+bOJr86MVIshntiy78=";
|
||||
hash = "sha256-fFJuN1MPpnpYCotAiQoRU5qEsyC6HjOTrjxfnyWj/+o=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-YOvzCKN2PqbyOgR5qhshI52/grQT2DStbdJgWBrVvsI=";
|
||||
npmDepsHash = "sha256-8xzyypPgtfxYxPcVIJYLNL0a6EE7L93eISanWqPFGM4=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "augeas";
|
||||
version = "1.14.1";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hercules-team";
|
||||
repo = "augeas";
|
||||
tag = "release-${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-U5tm3LDUeI/idHtL2Zy33BigkyvHunXPjToDC59G9VE=";
|
||||
hash = "sha256-FH+i/6nnhbp2j+45eNT63LzI/uY5KvLYePivyaO1odM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "aws-vault";
|
||||
version = "7.14.0";
|
||||
version = "7.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ByteNess";
|
||||
repo = "aws-vault";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Adb0k6Cb0Jq4LTexNYmCHThE+/4ariIutwy7pH2onoU=";
|
||||
hash = "sha256-SwV0eEABEhZoDGYFsGmpXOJMbCABYxwBZ76+ZS2pTvo=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-vdgQS4ziTzLHWVaIiHORlSEOYPEbMF3fsSabEJh26t0=";
|
||||
vendorHash = "sha256-Ilv0kg0RsPbV2TRiGyEbq9C7UowXXPZ5xQprY2ZbK04=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "bark-server";
|
||||
version = "2.3.5";
|
||||
version = "2.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Finb";
|
||||
repo = "bark-server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-s02nLAlKO5SGX0Nx5z/5fZBf6R0kkY4IofbGW8ica50=";
|
||||
hash = "sha256-uuMeBGCp15Rnw9rl6DX/mSG8dM4j0qqSoFv7LPXsVvw=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+WyTKyWVzJAgCQ6bXbOjrJUZkw5XVrvAdgALL2eXU64=";
|
||||
vendorHash = "sha256-9bG2spKX2UTgPenWWNUGOmJLuQFbJE8CgMpKZvLYSHE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
boost,
|
||||
m4ri,
|
||||
gd,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.2.15";
|
||||
pname = "brial";
|
||||
@@ -20,6 +20,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sha256 = "sha256-I8p2jdc2/oq9piy1QvNl+N0+MHDE5Xv1kawkRTjrWSU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/BRiAl/BRiAl/pull/64
|
||||
(fetchpatch {
|
||||
url = "https://github.com/BRiAl/BRiAl/commit/df5b4fd300cdbdd4cda920a27fdc5257f3cfea26.patch";
|
||||
hash = "sha256-MwpXTmK+3hJB/J7V8iHPfgyrxc/s9LhHgkAZDq7wZb0=";
|
||||
})
|
||||
];
|
||||
|
||||
# FIXME package boost-test and enable checks
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-tally";
|
||||
version = "1.0.77";
|
||||
version = "1.0.78";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-bkikJU5qyq+6+PYCJrEmdZHIsPGz4prOt6g69hOIZ8o=";
|
||||
hash = "sha256-+zAi4Cgfi7rO0OcWv50Y7q3NiebLrdaPUR/SFKerrRA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hVkQdWOhM/R0hcrtzvlSFtw51jSRKNPmhDCNUbiK3rI=";
|
||||
cargoHash = "sha256-iYb2K70+jVJTdS65bZmcxE4eJstcqtx10NisU7NaW/Q=";
|
||||
|
||||
meta = {
|
||||
description = "Graph the number of crates that depend on your crate over time";
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ciel";
|
||||
version = "3.10.4";
|
||||
version = "3.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AOSC-Dev";
|
||||
repo = "ciel-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oKYPhevy0o5IxxqMneWAamRyZr7yForbsuhszWDUaQk=";
|
||||
hash = "sha256-Axb41MJr59NTT1WruGpYlTOXnCa0cIgC8i4uhDkv6FI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hrjZKowkTQaNDrwOYM6pvUomcBrMrvlgvLl0UreeW8U=";
|
||||
cargoHash = "sha256-VLTPcPmdUpa/6A/iaL8Oe8/QmeQMMP40j8J4nEEAeTQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "cine";
|
||||
version = "1.8.4";
|
||||
version = "1.8.6";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diegopvlk";
|
||||
repo = "Cine";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zUsfAe8PdfBv9XzJ0mY+ELIcl+x35v11THj9gtG/fxg=";
|
||||
hash = "sha256-wtHrKrDpjMVOP1XZ4q+KQ5UBPRq/MNxyKTKuJpryU6o=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,83 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
llvmPackages_19,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
gfortran,
|
||||
blas,
|
||||
boost,
|
||||
python3,
|
||||
ocl-icd,
|
||||
opencl-headers,
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv' = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv;
|
||||
in
|
||||
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "clblas";
|
||||
version = "2.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clMathLibraries";
|
||||
repo = "clBLAS";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Wq5oBl3TW3qpK0cyNWVgJMS5/s8xY1dulqDCkkX5lZQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./platform.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/clMathLibraries/clBLAS/commit/68ce5f0b824d7cf9d71b09bb235cf219defcc7b4.patch";
|
||||
hash = "sha256-XoVcHgJ0kTPysZbM83mUX4/lvXVHKbl7s2Q8WWiUnMs=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt
|
||||
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
|
||||
substituteInPlace src/library/tools/tplgen/CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
cd src
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_TEST=OFF"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gfortran
|
||||
python3
|
||||
];
|
||||
buildInputs = [
|
||||
blas
|
||||
boost
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
ocl-icd
|
||||
opencl-headers
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/clMathLibraries/clBLAS";
|
||||
description = "Software library containing BLAS functions written in OpenCL";
|
||||
longDescription = ''
|
||||
This package contains a library of BLAS functions on top of OpenCL.
|
||||
'';
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
})
|
||||
@@ -1,34 +0,0 @@
|
||||
diff --git a/src/library/tools/ktest/config.cpp b/src/library/tools/ktest/config.cpp
|
||||
index 8b20128..faf9bde 100644
|
||||
--- a/src/library/tools/ktest/config.cpp
|
||||
+++ b/src/library/tools/ktest/config.cpp
|
||||
@@ -24,8 +24,6 @@
|
||||
|
||||
using namespace clMath;
|
||||
|
||||
-static const char DEFAULT_PLATFORM_NAME[] = "AMD Accelerated Parallel Processing";
|
||||
-
|
||||
Config::Config() :
|
||||
defaultConfig_(""),
|
||||
cpp_("ktest.cpp"),
|
||||
@@ -35,7 +33,10 @@ Config::Config() :
|
||||
hasFuncID_(false), hasSubdims_(false),
|
||||
skipAccuracy_(false)
|
||||
{
|
||||
- setPlatform(DEFAULT_PLATFORM_NAME);
|
||||
+ platform_ = NULL;
|
||||
+ setPlatform("");
|
||||
+
|
||||
+ device_ = NULL;
|
||||
setDevice("");
|
||||
|
||||
memset(&kargs_, 0, sizeof(kargs_));
|
||||
@@ -262,7 +263,7 @@ Config::setPlatform(const std::string& name)
|
||||
continue;
|
||||
}
|
||||
if (name.empty()) {
|
||||
- found = (strcmp(pname, DEFAULT_PLATFORM_NAME) == 0);
|
||||
+ found = true;
|
||||
}
|
||||
else {
|
||||
found = (strcmp(pname, name.c_str()) == 0);
|
||||
@@ -18,16 +18,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cliamp";
|
||||
version = "2.0.1";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bjarneo";
|
||||
repo = "cliamp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-r7MrrcVt+/f+iPozn9jaczJmpPv431wAoW8LvHKBtB8=";
|
||||
hash = "sha256-PC+1uOt/LBGkW+ASNyGrS0e/rB8mcr+ILlcnf3F8esU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rtwUWbft5XGEbuBCn0OMCn4TS5Ul+UXJNIqNOzXfU+M=";
|
||||
vendorHash = "sha256-d/ENFm9b1DkIir1lz50VVX1pvuQpwPUVlA5XOC7Jj5o=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -1,86 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
gfortran,
|
||||
opencl-headers,
|
||||
clblas,
|
||||
ocl-icd,
|
||||
mkl,
|
||||
intel-ocl,
|
||||
}:
|
||||
|
||||
let
|
||||
incfile = builtins.toFile "make.inc.custom" ''
|
||||
CC = g++
|
||||
FORT = gfortran
|
||||
|
||||
ARCH = ar
|
||||
ARCHFLAGS = cr
|
||||
RANLIB = ranlib
|
||||
|
||||
OPTS = -fPIC -O3 -DADD_ -Wall
|
||||
FOPTS = -fPIC -O3 -DADD_ -Wall -x f95-cpp-input
|
||||
F77OPTS = -fPIC -O3 -DADD_ -Wall
|
||||
LDOPTS = -fPIC
|
||||
|
||||
-include make.check-mkl
|
||||
-include make.check-clblas
|
||||
|
||||
# Gnu mkl is not available I guess?
|
||||
#LIB = -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lpthread -lm -fopenmp
|
||||
LIB = -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lm -fopenmp
|
||||
LIB += -lclBLAS -lOpenCL
|
||||
|
||||
LIBDIR = -L$(MKLROOT)/lib/intel64 \
|
||||
-L$(MKLROOT)/../compiler/lib/intel64 \
|
||||
-L$(clBLAS)/lib64
|
||||
|
||||
INC = -I$(clBLAS)/include
|
||||
#-I$(AMDAPP)/include
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clmagma";
|
||||
version = "1.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://icl.cs.utk.edu/projectsfiles/magma/cl/clmagma-${version}.tar.gz";
|
||||
sha256 = "1n27ny0xhwirw2ydn46pfcwy53gzia9zbam4irx44fd4d7f9ydv7";
|
||||
name = "clmagma-${version}.tar.gz";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gfortran
|
||||
clblas
|
||||
opencl-headers
|
||||
ocl-icd
|
||||
mkl
|
||||
intel-ocl
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
env = {
|
||||
MKLROOT = mkl;
|
||||
clBLAS = clblas;
|
||||
|
||||
# Otherwise build looks for it in /run/opengl-driver/etc/OpenCL/vendors,
|
||||
# which is not available.
|
||||
OPENCL_VENDOR_PATH = "${intel-ocl}/etc/OpenCL/vendors";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
# By default it tries to use GPU, and thus fails for CPUs
|
||||
sed -i "s/CL_DEVICE_TYPE_GPU/CL_DEVICE_TYPE_DEFAULT/" interface_opencl/clmagma_runtime.cpp
|
||||
sed -i "s%/usr/local/clmagma%/$out%" Makefile.internal
|
||||
cp ${incfile} make.inc
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Matrix Algebra on GPU and Multicore Architectures, OpenCL port";
|
||||
license = lib.licenses.bsd3;
|
||||
homepage = "https://icl.cs.utk.edu/magma/index.html";
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ volhovm ];
|
||||
};
|
||||
}
|
||||
@@ -29,18 +29,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codex";
|
||||
version = "0.159.1";
|
||||
version = "0.159.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = "codex";
|
||||
tag = "rust-v${finalAttrs.version}";
|
||||
hash = "sha256-74sN8GM4W+u8bMxOenSp9tmIDqAtrABCmU5J8IsqZWA=";
|
||||
hash = "sha256-djo9XISA01gXziGjCsSrNlQ67lRNb3FSwrfs03srYIE=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/codex-rs";
|
||||
|
||||
cargoHash = "sha256-3X4gmzAZG10DDcI667k9Zf+r3IvzeAAWD1NbTdQZyGY=";
|
||||
cargoHash = "sha256-U20V8MkGJZd+qTOQETzqB25QJPYxJGV89LiR1kToW7A=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
||||
@@ -11,19 +11,19 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "coroot";
|
||||
version = "1.26.8";
|
||||
version = "1.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coroot";
|
||||
repo = "coroot";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6vnJsj3PMRsC/Mal76tWcMVIf7EmvBQj4W0OzZSEUdc=";
|
||||
hash = "sha256-06DvjcUnr36Ae7ivSlXPwdgjiXjbGwCOKvZIa+NtfA8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QB5jz+ks9naRM7KvlxXUkMcTTtmy0SQXkfxGx/vh3W4=";
|
||||
npmDeps = fetchNpmDeps {
|
||||
src = "${finalAttrs.src}/front";
|
||||
hash = "sha256-QFuEdsyQUmvFGXGBJyOd5UKJv7JEWQ24YM3BwTMUNGU=";
|
||||
hash = "sha256-NrlZ4Lri43fkD7JclYlyLMKfRzNr2RIt4krGbZuJc68=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-app-library";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-app-library";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-oAGo8ByFHiSR9J57Ytn9kjMRwu103Retr9VcZjjaTtY=";
|
||||
hash = "sha256-7e9K1jWSPfUI6XeJU+/F/MZh0xb9ChJTIiYyR3Jtst0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UNSoRkHFQ1VpIeF/xMyONpwZ8hG5yUkTWqq/9LQ1wqs=";
|
||||
cargoHash = "sha256-nkqw7xfbMi5ErwwqCav5aODEVRywC/s6sJn1vNcjTVw=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
pulseaudio,
|
||||
pipewire,
|
||||
udev,
|
||||
lsof,
|
||||
xkeyboard_config,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
@@ -20,17 +21,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-applets";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-applets";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-OMz/lh5bJ7YjS6GLP+yQsJ9HvYNDedj2MMMA5pgwPEE=";
|
||||
hash = "sha256-Xq1/by/ytXqd+2ML4X/r01cs7hgTcC6Zt7T5XW539UI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iGnqu6Di2kxEAujzJ+Yy+A4cUZrdDjQ7aF3yrVz+QYU=";
|
||||
cargoHash = "sha256-9icbfWEWw56GA7/zSZN9/+Rp/dH0KPNLYrYh20jke0Q=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
@@ -50,6 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pulseaudio
|
||||
pipewire
|
||||
udev
|
||||
lsof
|
||||
];
|
||||
|
||||
dontUseJustBuild = true;
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-bg";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-bg";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-tvYVe3H99oB6NYzLjwzX+ccSFh54LAfvuLmFoCIaJp4=";
|
||||
hash = "sha256-RE7jI4NVJvPv14fUe8Ldp5dXTH6ScUJZ8iNdpxKsVfg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-j07BZ9JsY6UG9eXVxdn0CTWU8j/cGNA9lXrDsdF40lM=";
|
||||
cargoHash = "sha256-4jXd7uJEREPqrJvpt5aAf+3V+8+XViDb8zqmgq+qvU4=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -20,17 +20,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-comp";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-comp";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-axWy7F05WOt03WX4nYdObclFf3E12C4zxQ2eNLOjPp0=";
|
||||
hash = "sha256-/q2SDp9Sa2MG4bMtryOizxnhPovrAgYb9GXQ35NRs6c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-J9/7DVMyx4SV/BKhg4l9B4haRdGfspmoZjr8LPTzmgo=";
|
||||
cargoHash = "sha256-WTpJuj3Xz9hHLj+kuhys0Fr8FmosAuXpbtNSK3Y5twU=";
|
||||
|
||||
# Only default feature is systemd
|
||||
buildNoDefaultFeatures = !useSystemd;
|
||||
|
||||
@@ -16,21 +16,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-edit";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-edit";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-mZnL9W67hnHVS4wJBAprdPzU8VEq6mguzuhXjtPPIhc=";
|
||||
hash = "sha256-7ZtTvufmJalW8+9gFhh69M0OrPV91skToqEzMfmeqI8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-NERnN9TqqpzI9kD2ujfs11W0RnVxU+Ra6GjGk3FGO3A=";
|
||||
cargoHash = "sha256-IfG1OdeSdJD45qx32Ux/Zp1MZNNpXnMamf2bUaZaqwA=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -12,17 +12,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-files";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-files";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-AHb+DIoQ4LKE//QSFKxTbmmse1D9C6VYQ0vhiqnbFaY=";
|
||||
hash = "sha256-QtCiyTkPPnN2fWTlX0y4Pxn43sn3djYN9IIv+O9ihKs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wO4tci+Ocd9sIwp2lQN7RNKc+XeqvlSJGdViQ+lVt4Q=";
|
||||
cargoHash = "sha256-cqDRvByVLR3pcoTvQUeEjtAx+E2NSJQoZRlp6jOkfoI=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
@@ -59,6 +59,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
cargoBuildFlags="$defaultCargoBuildFlags --package cosmic-files"
|
||||
runHook cargoBuildHook
|
||||
|
||||
cargoBuildFlags="$defaultCargoBuildFlags --package cosmic-files-thumbnailer"
|
||||
runHook cargoBuildHook
|
||||
|
||||
cargoBuildFlags="$defaultCargoBuildFlags --package cosmic-files-applet"
|
||||
runHook cargoBuildHook
|
||||
|
||||
@@ -73,6 +76,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
cargoTestFlags="$defaultCargoTestFlags --package cosmic-files"
|
||||
runHook cargoCheckHook
|
||||
|
||||
cargoTestFlags="$defaultCargoTestFlags --package cosmic-files-thumbnailer"
|
||||
runHook cargoCheckHook
|
||||
|
||||
cargoTestFlags="$defaultCargoTestFlags --package cosmic-files-applet"
|
||||
runHook cargoCheckHook
|
||||
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-greeter";
|
||||
version = "1.8.0";
|
||||
version = "1.9.1";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-greeter";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-mC8m6hbQ6VgJoFl7VFRkbKl4zev8pffKHRtzvXtwoRo=";
|
||||
hash = "sha256-XKktgBfv6oWOiEPUOkNDTEZruROxGZelDZiCwmP9DAc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
substituteInPlace src/greeter.rs --replace-fail '/usr/bin/orca' '${lib.getExe orca}'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-vHR9go8/iVUT7oBV8h+mmBvhi2oSKNBKtV0uoDOr6go=";
|
||||
cargoHash = "sha256-/yIwqJXQD8mZwWwSI2gcYklnVjy/47Dl5O8mPEKPqTA=";
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cosmic-icons";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-idle";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-initial-setup";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-initial-setup";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-Qv95Q528TN/UafVS3C6yZqvbu/EDT+/Gj0Od50ZvIVs=";
|
||||
hash = "sha256-S26e8QDwFySJEhjiMtiSN+WSVK6z/5AXk/QqBg4uUCY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-launcher";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-launcher";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-qfBP5EzI7+oVYt5MdY+WypG5SvsFvk46F78q/cwIpWo=";
|
||||
hash = "sha256-V9KsYD8rMrrCvlBMiqveirP7Sl/CggYvMM/sw5vLLsY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NwIcWFnN6ulNq0RVMYLlYfHGbMTgd71mbqzAAP5ZCKc=";
|
||||
cargoHash = "sha256-YNd1y4NdcksZvX8G4EgR5iQWJOww6WyiwtBYH3jW20M=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -12,17 +12,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-monitor";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-monitor";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-nItwje+QZkR0L+wOsmOVPJwo4THwiRLLvIFvH6XP31o=";
|
||||
hash = "sha256-pYBS7pe9si+KzgIHjheYdPQ4mrZM47XV0cD/WM34Xvc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-HHKIXKyS1zDkNGbsEWiKghPqIsPKRUJtjxKuNfI6mak=";
|
||||
cargoHash = "sha256-oUNAhoJcT1Dlu89d9OgoeKdH6ykLtYFWWI4KbM0ThNY=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -12,17 +12,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-notifications";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-notifications";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-HhhmsAngWseqXOPy5ra2BIakiBD9YskE2IsjqXaMVGs=";
|
||||
hash = "sha256-8YlImiN8INfkVZDmRjGWsjQ94i0ORHyOW0pxPO0MPPY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-32AoA17CO4noUzKhx+KDBpy5fWG4lvSBMK5aVJW8K9o=";
|
||||
cargoHash = "sha256-kj84JxsqTD0WnNkUqWJj4SXS8xtI1xNXmn2VcTe6Qs8=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -15,17 +15,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-osd";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-osd";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-bb1NKMRl8gyQ8PRniS4eIrmjkZ2ayyMi2AkzejXV+3Y=";
|
||||
hash = "sha256-kGYoPIE/owCdoT3uNpDA1w1D1zbRMGrxOS6Yp3BfXzo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-C0GR/VWWu2zOAvAokQnM+g+OJqQM2s2WUf2ffwfZieI=";
|
||||
cargoHash = "sha256-YLrUev919xxG74F5Vk85XbJjAvb5IfsDjM6flr7HJwE=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
77
pkgs/by-name/co/cosmic-osk/package.nix
Normal file
77
pkgs/by-name/co/cosmic-osk/package.nix
Normal file
@@ -0,0 +1,77 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
libcosmicAppHook,
|
||||
just,
|
||||
udev,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-osk";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-osk";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-9lLzO+s1o3Vj68cEnqE6wnke89ZDargZxlz7vY5VsBk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-r5XlNx1GIy4gEiHX9QVYLEufRnuwxe9X4OBbz3tinIo=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
libcosmicAppHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
udev
|
||||
];
|
||||
|
||||
dontUseJustBuild = true;
|
||||
dontUseJustCheck = true;
|
||||
|
||||
justFlags = [
|
||||
"--set"
|
||||
"prefix"
|
||||
(placeholder "out")
|
||||
"--set"
|
||||
"cargo-target-dir"
|
||||
"target/${stdenv.hostPlatform.rust.cargoShortTarget}"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit (nixosTests)
|
||||
cosmic
|
||||
cosmic-autologin
|
||||
cosmic-noxwayland
|
||||
cosmic-autologin-noxwayland
|
||||
;
|
||||
};
|
||||
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"epoch-(.*)"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/pop-os/cosmic-osk";
|
||||
description = "COSMIC On-Screen Keyboard";
|
||||
mainProgram = "cosmic-osk";
|
||||
license = lib.licenses.gpl3Only;
|
||||
teams = [ lib.teams.cosmic ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-panel";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-panel";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-Cl4F9vf39qLT/ZVCP9dUJ6YTQq47Wl8tbjbu1b+6tgY=";
|
||||
hash = "sha256-nnWr7kLqJiaPIOI6OyH20KGbnOEpYhzjjdi03Z2oBCM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XIthlStPM97vjhJTdofUOkOudH1id6W2U4YdOxEh/eo=";
|
||||
cargoHash = "sha256-02BfZfASrQYn/nwmxS7CRS7ONie8b22F0V3XwFVyfKE=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-player";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-player";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-6AbCB1d4g9iy77HRXxEs0KT/7Ry6/quJs3Qumw5jTKI=";
|
||||
hash = "sha256-h5sfUOCboMWoHMFwACWGFtXqiIJA5a1LBDU4oAF57t0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9ReitIbvr6D+BGLa1xumi67DPG3YlgdA4pZ/rfvn4Cc=";
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-randr";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-screenshot";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-session";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-session";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-sYrWH8Ve/KBoSd7uoCbctdF33rRdrUnTT5MABXhZZEs=";
|
||||
hash = "sha256-Evl2GxjZZqGCNSfmbmC22+QNRBBl7in0sjmeAqC5cjg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail '/usr/bin/start-cosmic' "$out/bin/start-cosmic"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-5dLG40X+yxJo566guyHqOCLNp+uNSE+HONS8GIDm58A=";
|
||||
cargoHash = "sha256-IoSLvxpc/1X1a6cDl4ZpoUpxHM7bsH3v2BU6wiQROhM=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-settings-daemon";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-settings-daemon";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-D7f5IERgNP9JrmAIiHp6jlBZUOt+n8FpEiGx1jqqwgs=";
|
||||
hash = "sha256-0xacJ7NivwME4w079Tu+Jdm2CTmnSp0cPpviAVs4yQU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail '/usr/share/themes/adw-gtk3' '${adw-gtk3}/share/themes/adw-gtk3'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-4rGgRc7EDdxGvFmAUY4kJ9aO/Pas9S2Q+b5ArZNydvs=";
|
||||
cargoHash = "sha256-ba3JKWTC5f0DSIILayUFmQQfA3oHaq477AzL3qo3CDE=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -16,6 +16,8 @@
|
||||
pulseaudio,
|
||||
udev,
|
||||
dav1d,
|
||||
pciutils,
|
||||
desktop-file-utils,
|
||||
cosmic-randr,
|
||||
xkeyboard_config,
|
||||
nix-update-script,
|
||||
@@ -28,17 +30,17 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-settings";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-settings";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-53DJw3oSVGsgpy/BNnxOT60J7kRB0kp18qrjP2IR4gI=";
|
||||
hash = "sha256-fL6/e8nwqk7zJeeFX8GtG1RE5VY03RbP9e3JBbXZBgc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NT4y838qjvdOuFLqAk6I2c5cHbmhMs3JrGoIIhw4+FE=";
|
||||
cargoHash = "sha256-zk0XFCDyzliMyG40EEvgcEg0Qxkisw0dCWzlR1Tjh7I=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
@@ -60,6 +62,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pulseaudio
|
||||
udev
|
||||
dav1d
|
||||
pciutils
|
||||
desktop-file-utils
|
||||
];
|
||||
|
||||
dontUseJustBuild = true;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cosmic-sound-theme";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
|
||||
@@ -15,17 +15,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-store";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-store";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-z2w+FYNGsvRzCRp5EQ1QwrITHso2HhCAVz19M50Tk48=";
|
||||
hash = "sha256-HKRjcyNRVS0hmN7mtTDHioJxyqJAhsmz4vSqzn5Dsg8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MxLb1ur7IwVAfAxViXXaFoVN35vhuIF1S1HRvg3wPo4=";
|
||||
cargoHash = "sha256-UKuAMppeSoHr2sCAZTdtTrD/C0gu/RlIW5og5X78q6k=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -15,17 +15,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-term";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-term";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-eXy7gSjcBu3kALJEbHp7BgKg9H7FIgrKfGWgiad7Z1M=";
|
||||
hash = "sha256-QIwOEDiU6oJjQ+Vr8Atk5moBkTD/hUKWFxNCfym8d3k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NN3kX0/ea7Q+QcWO8eAchsSaIVuudbf5dbCRiRZdnBg=";
|
||||
cargoHash = "sha256-wJH0Ar4FHzAiUPRXIqOwdgv68NJwwUVhixTNtkwJad4=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-viewer";
|
||||
version = "0-unstable-2026-07-27";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-viewer";
|
||||
rev = "6c999eb5100353260d481077f1820ef95ee68ea7";
|
||||
hash = "sha256-KUfWA6ZZMSnzagFJNlHJoWJTcMP2jTd0j7BYTYKfBF4=";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-+BpwyavhFTCSS2AC/vgfkx9FqNBaVjS3+fqE28auUIw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Ws8ozNY3hwxdkb5g6RuSDyzt3IRk1svm3byXkIpknQE=";
|
||||
cargoHash = "sha256-vPUhFkDFIEJ+uHmCcc54jQVzks3orQdu2JUPEfIimOw=";
|
||||
|
||||
separateDebugInfo = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cosmic-wallpapers";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-workspaces-epoch";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-workspaces-epoch";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-ntn1mW6YKpSXNZQbkZRFhUHbZur3JtJD9A/MzI+AUMQ=";
|
||||
hash = "sha256-lQxOmO0QklJBripTOeYnUtGqDHrZLha4weSqqhVXLWo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0ZvnMT7wkMyZ9zHOBGZNh+DmLaoATHvpSplSnVgC/j4=";
|
||||
|
||||
69
pkgs/by-name/co/cow/package.nix
Normal file
69
pkgs/by-name/co/cow/package.nix
Normal file
@@ -0,0 +1,69 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromCodeberg,
|
||||
bison,
|
||||
cairo,
|
||||
flex,
|
||||
libbsd,
|
||||
libevent,
|
||||
libxkbcommon,
|
||||
meson,
|
||||
ncurses,
|
||||
ninja,
|
||||
pango,
|
||||
pixman,
|
||||
pkg-config,
|
||||
lowdown,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
xwayland,
|
||||
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "cow";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "cow-wm";
|
||||
repo = "cow";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-TbnsCsBHJDsMkuOLPlesYzrY3pHd9qh/ZXQsszSJgxE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
libbsd
|
||||
libevent
|
||||
libxkbcommon
|
||||
ncurses
|
||||
pango
|
||||
pixman
|
||||
wayland
|
||||
wayland-protocols
|
||||
wayland-scanner
|
||||
xwayland
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
flex
|
||||
lowdown
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A stacking window manager using river as the compositor";
|
||||
homepage = "https://cow-wm.codeberg.page/cow/";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = with lib.maintainers; [
|
||||
dvn0
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "depot-cli";
|
||||
version = "2.102.9";
|
||||
version = "2.102.14";
|
||||
|
||||
__structuredAttrs = true;
|
||||
__darwinAllowLocalNetworking = true;
|
||||
@@ -19,7 +19,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "depot";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SBsNhg4r9FuqLvXBBg7AAX8rVrqGSc527GxwPG1r02Y=";
|
||||
hash = "sha256-9/XgZKG4amV04Mu9SPDVszsfAngDaCbRn+kZlu7fnKo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VCd0qdEmjuTB5HvQ9jEVoKKSKJpPxQ7iHOFQoifPIgY=";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "devbox";
|
||||
version = "0.17.5";
|
||||
version = "0.18.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jetify-com";
|
||||
repo = "devbox";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-m7FMUjKZZsmnjtnjPyyq0YUIjDQiyb5zBbpGiH4cdyw=";
|
||||
hash = "sha256-4qW4jVBYap1WH3I77fDH8HI0yRJc1EVHzheqQQwClI4=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
|
||||
# integration tests want file system access
|
||||
doCheck = false;
|
||||
|
||||
vendorHash = "sha256-zZUE0J6w1QbdMAKOt1xH3ql4G5FbaUgtD4Xpsw/tmIk=";
|
||||
vendorHash = "sha256-pA1wSCNEeGPUIXfqvrMoPtIT7NsB08PUSD4L3zq3amw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
85
pkgs/by-name/di/disktree/package.nix
Normal file
85
pkgs/by-name/di/disktree/package.nix
Normal file
@@ -0,0 +1,85 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
desktop-file-utils,
|
||||
makeBinaryWrapper,
|
||||
fontconfig,
|
||||
freetype,
|
||||
libGL,
|
||||
libxcb,
|
||||
libxkbcommon,
|
||||
openssl,
|
||||
vulkan-loader,
|
||||
wayland,
|
||||
gitMinimal,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "disktree";
|
||||
version = "0.10.1";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tobi";
|
||||
repo = "disktree";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HoJjSLQeLEK20SpEd40DakAwV6WTdtcWM779YCjI3Jk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+IG75eHRo1+4Sg5dq+b77UWYLKQlqPH30WtAnND/Cbk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
desktop-file-utils
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fontconfig
|
||||
freetype
|
||||
libGL
|
||||
libxcb
|
||||
libxkbcommon
|
||||
openssl
|
||||
vulkan-loader
|
||||
wayland
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "--package=disktree-app" ];
|
||||
cargoTestFlags = [ "--package=disktree-core" ];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 assets/disktree.svg \
|
||||
"$out/share/icons/hicolor/scalable/apps/disktree.svg"
|
||||
install -d "$out/share/applications"
|
||||
substitute packaging/disktree.desktop.in \
|
||||
"$out/share/applications/disktree.desktop" \
|
||||
--replace-fail '@BINDIR@' "$out/bin" \
|
||||
--replace-fail '@VERSION@' '${finalAttrs.version}'
|
||||
desktop-file-validate "$out/share/applications/disktree.desktop"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
patchelf "$out/bin/disktree" --add-rpath ${
|
||||
lib.makeLibraryPath [
|
||||
libGL
|
||||
vulkan-loader
|
||||
wayland
|
||||
]
|
||||
}
|
||||
wrapProgram "$out/bin/disktree" \
|
||||
--prefix PATH : ${lib.makeBinPath [ gitMinimal ]}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Disk usage treemap for finding and removing files";
|
||||
homepage = "https://github.com/tobi/disktree";
|
||||
changelog = "https://github.com/tobi/disktree/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ domenkozar ];
|
||||
mainProgram = "disktree";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dutctl";
|
||||
version = "1.0.0-alpha.3-unstable-2026-09-09";
|
||||
version = "1.0.0-alpha.4-unstable-2026-09-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BlindspotSoftware";
|
||||
repo = "dutctl";
|
||||
rev = "231342b09d8314e4f92360f3e0ae3769ecb94e17";
|
||||
hash = "sha256-orjt8xF34gSdXKdwVt5DdzyqoLxKQieCn7Blow2TA0Y=";
|
||||
rev = "f2d2aec5ad1f54b4380ab2b1d8c3aa4d270fd5d5";
|
||||
hash = "sha256-SbPOoaH0qOJMYEX73RxQuY0vwnMiw2Aez2BN3Eb0kr8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Hrye9URJ1WW1qQIDxSqgfvMzfhZMeQrffsoGbGU5HmY=";
|
||||
vendorHash = "sha256-trdOZfYUbw11/OT168WYyYGkwXkosSnL8h8z3tN9um0=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -33,14 +33,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dwarfs";
|
||||
version = "0.15.7";
|
||||
version = "0.15.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhx";
|
||||
repo = "dwarfs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-oC5Ki0Fc8c+PD39rRTzc2WErXkxEBZM+k9Ac5Xptats=";
|
||||
hash = "sha256-dz7fIBcVBBzGs9IWJ5stmyxJvtWXU2zTxJX/Tm+A6Zk=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -61,13 +61,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "easyeffects";
|
||||
version = "8.2.9";
|
||||
version = "8.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwmm";
|
||||
repo = "easyeffects";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-K1TZiH8Ykli1dIdTbqIOZt2uWXaROMhr1tGC9wfSmiI=";
|
||||
hash = "sha256-8SAmWeLK4eAtjoNzrlK+8qvshCY/T96KNk+oHBYdv9Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ejson";
|
||||
version = "1.5.5";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shopify";
|
||||
repo = "ejson";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-t0IjL+gB1bfHwS1eoMy/yKgayswECxpXyK8xq6iGMCg=";
|
||||
sha256 = "sha256-Tkr/o2hjbUiaoTBPesQ+ZIPeJteS/rsqGJBo2dvfqEc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vT9A4d+e+iOie5TNbu5EyPi5OZJ/m8Not3tCQc7Xwn8=";
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
@@ -30,7 +31,6 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/weaveworks/eksctl/pkg/version.gitCommit=${finalAttrs.src.rev}"
|
||||
"-X github.com/weaveworks/eksctl/pkg/version.buildDate=19700101-00:00:00"
|
||||
];
|
||||
@@ -44,6 +44,10 @@ buildGoModule (finalAttrs: {
|
||||
--zsh <($out/bin/eksctl completion zsh)
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "version";
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "CLI for Amazon EKS";
|
||||
homepage = "https://github.com/eksctl-io/eksctl";
|
||||
|
||||
@@ -11,6 +11,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "enroot";
|
||||
version = "4.2.1";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "enroot";
|
||||
@@ -21,7 +24,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail 'git submodule update' 'echo git submodule update'
|
||||
--replace-fail \
|
||||
'git submodule update' \
|
||||
'echo git submodule update'
|
||||
''
|
||||
# GCC >= 16 implicitly links `-latomic_asneeded`, which does not exist in the musl sysroot
|
||||
+ lib.optionalString (stdenv.cc.isGNU && (lib.versionAtLeast stdenv.cc.version "16")) ''
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail \
|
||||
'$(UTILS): LDFLAGS += -pie -static-pie' \
|
||||
'$(UTILS): LDFLAGS += -pie -static-pie -fno-link-libatomic'
|
||||
'';
|
||||
|
||||
makeTarget = "install";
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "etlegacy-assets";
|
||||
version = "2.85.0";
|
||||
version = "2.86.0";
|
||||
|
||||
srcs =
|
||||
let
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
versionCheckHook,
|
||||
}:
|
||||
let
|
||||
version = "2.85.0";
|
||||
version = "2.86.0";
|
||||
fakeGit = writeScriptBin "git" ''
|
||||
if [ "$1" = "describe" ]; then
|
||||
echo "${version}"
|
||||
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
|
||||
owner = "etlegacy";
|
||||
repo = "etlegacy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-oOgoM5BLBnmrmbdXFGYkVcQLYq8tVpLgnzJXax7g3vI=";
|
||||
hash = "sha256-3m6LJtZ0AbTYPXVnX80wdW7Wchd4mp5v5QAWKPjwctA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -20,7 +20,7 @@ let
|
||||
in
|
||||
symlinkJoin {
|
||||
pname = "etlegacy";
|
||||
version = "2.85.0";
|
||||
version = "2.86.0";
|
||||
|
||||
paths = [
|
||||
etlegacy-assets
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
|
||||
buildDotnetGlobalTool (finalAttrs: {
|
||||
pname = "fable";
|
||||
version = "5.17.2";
|
||||
version = "5.18.0";
|
||||
|
||||
nugetHash = "sha256-XJB59cqLDsEtcyAvbbuhSkjkooFKiHiwp9jrKouPPtk=";
|
||||
nugetHash = "sha256-zaa7UJnn5IM7fhGUBmogRUDe/2rpH79UR+k6dym7kmQ=";
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_10_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_10_0;
|
||||
|
||||
@@ -71,8 +71,6 @@ stdenv.mkDerivation rec {
|
||||
libcouchbase
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-USE_PCSC=ON" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./src/libfido2.pc.in \
|
||||
--replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@"
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "newt";
|
||||
version = "1.17.0";
|
||||
version = "1.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "newt";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-lwDywGs1Wh5jl9xwEd7KvXqEkLw7gCas44SbHtKx8Ps=";
|
||||
hash = "sha256-1ZS3KmEldOq2r+p4ayF852IS94/Wmkhqdw/Jx/W0Wcg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VOXZWcPnBSc8EKYLKhsrQTHSjXvpaEYoewYLCxJ8Nk8=";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "olm";
|
||||
version = "1.9.1";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "olm";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LsT+Dt6Ozp447VtLKc/2MH9HGkfMwrOFIEp43DsNaXY=";
|
||||
hash = "sha256-A3SpDzl/cW/4tCVFWrRpWoaLmBD8J3eniKf/p9ZX/g8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1lZoB27aedPGxsiZrKy0++QN1OobCXc69r3j+0XhCjM=";
|
||||
vendorHash = "sha256-p4ClY6MT7JNGYI4qOdLBAGyyEAqW4DVlwRta+xSmd9E=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
doxygen,
|
||||
eigen,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
fmt,
|
||||
graphviz,
|
||||
gts,
|
||||
@@ -62,13 +61,13 @@ in
|
||||
freecad-utils.makeCustomizable (
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freecad";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeCAD";
|
||||
repo = "FreeCAD";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-RP68rd19wX4gDD5PuRQ1J4Z9Qmp5HpEg6sC94RRMEdI=";
|
||||
hash = "sha256-VB2jxacRtpLeVaCMuHqGDzNZKx5wqOJXYlbJEpDXB70=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -106,15 +105,7 @@ freecad-utils.makeCustomizable (
|
||||
]
|
||||
++ pythonDeps;
|
||||
|
||||
patches = [
|
||||
./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
|
||||
(fetchpatch {
|
||||
# https://github.com/FreeCAD/FreeCAD/pull/30899
|
||||
# fix COIN3D_MICRO_VERSION regex for coin 4.0.10
|
||||
url = "https://github.com/FreeCAD/FreeCAD/commit/e3e56059865849c6b1c85161f69183ad872414e3.patch";
|
||||
hash = "sha256-qe0wn7DwvQT/pmrSCa44+orMetztpw8DZ+NhDJEYAMw=";
|
||||
})
|
||||
];
|
||||
patches = [ ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/Mod/Fem/femmesh/gmshtools.py \
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ghr";
|
||||
version = "0.18.4";
|
||||
version = "0.18.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tcnksm";
|
||||
repo = "ghr";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-zgRtu8RYyfBwSRs1nCOONyFLCRS6wCKqSLmqOLdJ9H0=";
|
||||
sha256 = "sha256-uUVZ26GE73LKQ/s0I4VX60EC5dLGA5UotJw0ndpSv0k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-j5wa8rK4+gjjdJP7BlixDlztHdvSHzUeTuJKitQzc1M=";
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
let
|
||||
pname = "gitlab-ci-local";
|
||||
version = "4.75.1";
|
||||
version = "4.76.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firecow";
|
||||
repo = "gitlab-ci-local";
|
||||
rev = version;
|
||||
hash = "sha256-2zCfLLOtFTsiW1TGujOa9JGOetlVTzY477pUa2wt2qw=";
|
||||
hash = "sha256-K03nw+8SNnqm4ouOIa3ejUmcsUdVzdGn2jMZY5bKVOI=";
|
||||
};
|
||||
|
||||
node_modules = stdenv.mkDerivation {
|
||||
@@ -57,7 +57,7 @@ let
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
outputHash = "sha256-AqO7FeCtd5INzASBjMgSXYI1WPjqtk3Uipd5TjocYX4=";
|
||||
outputHash = "sha256-yx1ev37/78bjaNcA1/tSxKEn2cHx0CexZByL16AAUvw=";
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "giza";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danieljprice";
|
||||
repo = "giza";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-72eeV0OmUoiebJ0IEBdvPKzEbm33Q1sfQ7PyteA+tzA=";
|
||||
hash = "sha256-iax/Tefx33nPuNEfikmiNoCjIUNyhyKwQfGxr+DZxr0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
let
|
||||
version = "2.2.6";
|
||||
version = "2.2.7";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "goflow2";
|
||||
@@ -14,7 +14,7 @@ buildGoModule {
|
||||
owner = "netsampler";
|
||||
repo = "goflow2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PGXBsUDooYEq5RuLRwmTMOxYuXCxhfAo9Ef/75TWPc0=";
|
||||
hash = "sha256-a8o9d8L4qkavCQang6Ukm5ColFAEn1DXow0BWoUJXms=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gotestwaf";
|
||||
version = "0.5.9";
|
||||
version = "0.5.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wallarm";
|
||||
repo = "gotestwaf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KQG47T1wd6uaJgm15vRqx1HB1jVNVIEZI90eHMlXMlg=";
|
||||
hash = "sha256-KF9fg60iPkIIrk6WI1jdxcebUc0SO2vBWkAY8nGX6rs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tGpgQ1c5mdstq5LX5egmm/ntmjuq2R6eWphsxV5q2b8=";
|
||||
|
||||
@@ -43,6 +43,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
xcbuild
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
substituteInPlace vendor/libghostty-vt/src/build/GhosttyLibVt.zig \
|
||||
--replace-fail 'lib.bundle_compiler_rt = true;' 'lib.bundle_compiler_rt = false;' \
|
||||
--replace-fail 'lib.bundle_ubsan_rt = true;' 'lib.bundle_ubsan_rt = false;'
|
||||
'';
|
||||
|
||||
# Upstream binary tests are renamed, added, or changed between releases and
|
||||
# depend on host process details, so Nix-only patches for them are brittle.
|
||||
doCheck = false;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user