mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-18 02:05:51 +03:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
6e287cb9de
@ -343,7 +343,24 @@ rec {
|
||||
, newScope
|
||||
}:
|
||||
{ otherSplices
|
||||
# Attrs from `self` which won't be spliced.
|
||||
# Avoid using keep, it's only used for a python hook workaround, added in PR #104201.
|
||||
# ex: `keep = (self: { inherit (self) aAttr; })`
|
||||
, keep ? (_self: {})
|
||||
# Additional attrs to add to the sets `callPackage`.
|
||||
# When the package is from a subset (but not a subset within a package IS #211340)
|
||||
# within `spliced0` it will be spliced.
|
||||
# When using an package outside the set but it's available from `pkgs`, use the package from `pkgs.__splicedPackages`.
|
||||
# If the package is not available within the set or in `pkgs`, such as a package in a let binding, it will not be spliced
|
||||
# ex:
|
||||
# ```
|
||||
# nix-repl> darwin.apple_sdk.frameworks.CoreFoundation
|
||||
# «derivation ...CoreFoundation-11.0.0.drv»
|
||||
# nix-repl> darwin.CoreFoundation
|
||||
# error: attribute 'CoreFoundation' missing
|
||||
# nix-repl> darwin.callPackage ({ CoreFoundation }: CoreFoundation) { }
|
||||
# «derivation ...CoreFoundation-11.0.0.drv»
|
||||
# ```
|
||||
, extra ? (_spliced0: {})
|
||||
, f
|
||||
}:
|
||||
|
||||
@ -1411,6 +1411,12 @@
|
||||
githubId = 58516559;
|
||||
name = "Alexander Rezvov";
|
||||
};
|
||||
argrat = {
|
||||
email = "n.bertazzo@protonmail.com";
|
||||
github = "argrat";
|
||||
githubId = 98821629;
|
||||
name = "Nicolò Bertazzo";
|
||||
};
|
||||
arian-d = {
|
||||
email = "arianxdehghani@gmail.com";
|
||||
github = "arian-d";
|
||||
@ -19179,6 +19185,12 @@
|
||||
githubId = 43315;
|
||||
name = "William Roe";
|
||||
};
|
||||
wladmis = {
|
||||
email = "dev@wladmis.org";
|
||||
github = "wladmis";
|
||||
githubId = 5000261;
|
||||
name = "Wladmis";
|
||||
};
|
||||
wldhx = {
|
||||
email = "wldhx+nixpkgs@wldhx.me";
|
||||
github = "wldhx";
|
||||
|
||||
@ -42,11 +42,6 @@ in {
|
||||
<https://github.com/swaywm/sway/wiki> and
|
||||
"man 5 sway" for more information'');
|
||||
|
||||
enableRealtime = mkEnableOption (lib.mdDoc ''
|
||||
add CAP_SYS_NICE capability on `sway` binary for realtime scheduling
|
||||
privileges. This may improve latency and reduce stuttering, specially in
|
||||
high load scenarios'') // { default = true; };
|
||||
|
||||
package = mkOption {
|
||||
type = with types; nullOr package;
|
||||
default = defaultSwayPackage;
|
||||
@ -154,14 +149,6 @@ in {
|
||||
"sway/config".source = mkOptionDefault "${cfg.package}/etc/sway/config";
|
||||
};
|
||||
};
|
||||
security.wrappers = mkIf (cfg.enableRealtime && cfg.package != null) {
|
||||
sway = {
|
||||
owner = "root";
|
||||
group = "root";
|
||||
source = "${cfg.package}/bin/sway";
|
||||
capabilities = "cap_sys_nice+ep";
|
||||
};
|
||||
};
|
||||
# To make a Sway session available if a display manager like SDDM is enabled:
|
||||
services.xserver.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ]; }
|
||||
(import ./wayland-session.nix { inherit lib pkgs; })
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -360,12 +360,12 @@
|
||||
};
|
||||
dart = buildGrammar {
|
||||
language = "dart";
|
||||
version = "0.0.0+rev=e14bbac";
|
||||
version = "0.0.0+rev=f71e310";
|
||||
src = fetchFromGitHub {
|
||||
owner = "UserNobody14";
|
||||
repo = "tree-sitter-dart";
|
||||
rev = "e14bbac8a0fcb6fab1b3becf6ed3fe464123c377";
|
||||
hash = "sha256-9CNKTaP9XudM6BDUlXmroJZ31c3eqjF2s0+Bb5mcfm4=";
|
||||
rev = "f71e310a93010863f4b17a2a501ea8e2032c345b";
|
||||
hash = "sha256-6iRUtQ1bol0a7whK35MaJ3UKrxmTAzchQ8Yxy4TeerE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart";
|
||||
};
|
||||
@ -593,12 +593,12 @@
|
||||
};
|
||||
forth = buildGrammar {
|
||||
language = "forth";
|
||||
version = "0.0.0+rev=e7d1f8a";
|
||||
version = "0.0.0+rev=9018923";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlexanderBrevig";
|
||||
repo = "tree-sitter-forth";
|
||||
rev = "e7d1f8a351fd5e95d9a89a8e87878c49ca14a5b0";
|
||||
hash = "sha256-AoV/DoQl2j4U0evWrM7ke544sei8VpdednWojwbhicU=";
|
||||
rev = "90189238385cf636b9ee99ce548b9e5b5e569d48";
|
||||
hash = "sha256-vySBDu9cMnubu4+7/sBttNxg1S4/MxWUKpjwEa14Rws=";
|
||||
};
|
||||
meta.homepage = "https://github.com/AlexanderBrevig/tree-sitter-forth";
|
||||
};
|
||||
@ -681,12 +681,12 @@
|
||||
};
|
||||
gitattributes = buildGrammar {
|
||||
language = "gitattributes";
|
||||
version = "0.0.0+rev=2339ffe";
|
||||
version = "0.0.0+rev=f58a4a4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ObserverOfTime";
|
||||
repo = "tree-sitter-gitattributes";
|
||||
rev = "2339ffe87a88d0b7838c015592c8269eb0063140";
|
||||
hash = "sha256-O3yzJjxrHdDoqcYu4ZDqrMuzinb0/0ub4puaSZPaG3c=";
|
||||
rev = "f58a4a4bc55b9b43dfa7c4106257422764f97776";
|
||||
hash = "sha256-COCQXia5TiPjJ8/WZELB2lARbn/5YeNvunrm+GHFDQs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gitattributes";
|
||||
};
|
||||
@ -714,12 +714,12 @@
|
||||
};
|
||||
gleam = buildGrammar {
|
||||
language = "gleam";
|
||||
version = "0.0.0+rev=32c8f1e";
|
||||
version = "0.0.0+rev=0589025";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gleam-lang";
|
||||
repo = "tree-sitter-gleam";
|
||||
rev = "32c8f1e32aee036583ca09e7e6e4ea881852b42c";
|
||||
hash = "sha256-tAYlenGQM+TK8AR8RtyDULBgWjAXgHx13/lrhNAZVhs=";
|
||||
rev = "0589025ee57e335fe0698190a1bc322748d8f026";
|
||||
hash = "sha256-/lNo6p4hsl7TiWzIdJOuSHu0RFwPYdZGIVzlcgKOWr4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
|
||||
};
|
||||
@ -736,12 +736,12 @@
|
||||
};
|
||||
glsl = buildGrammar {
|
||||
language = "glsl";
|
||||
version = "0.0.0+rev=952739a";
|
||||
version = "0.0.0+rev=bea82d3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-glsl";
|
||||
rev = "952739a25a7c014882aa777f1a32da8950f31f58";
|
||||
hash = "sha256-f68bObZPZuPvzyLYP/PeZKbtG0YqbX8BhsLyviBfRY4=";
|
||||
rev = "bea82d337801e472e35b5cd08038afdf13263768";
|
||||
hash = "sha256-O1c9LJex/VHAYuoVaM6dMhTSKNg7RYZJ4N+MYAYZ/AE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
|
||||
};
|
||||
@ -978,12 +978,12 @@
|
||||
};
|
||||
htmldjango = buildGrammar {
|
||||
language = "htmldjango";
|
||||
version = "0.0.0+rev=717e83a";
|
||||
version = "0.0.0+rev=8873e3d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "interdependence";
|
||||
repo = "tree-sitter-htmldjango";
|
||||
rev = "717e83aefd328735beeeb671f3f95b2624e70c57";
|
||||
hash = "sha256-xOWR5Lp9Ggkqmm5rutKrnMNXFASdyn6vPtxcY2mu2zs=";
|
||||
rev = "8873e3df89f9ea1d33f6235e516b600009288557";
|
||||
hash = "sha256-zVpjgnP39ToEDf59Ldq/DhRVKZOGaWX+usVOcSsJX3k=";
|
||||
};
|
||||
meta.homepage = "https://github.com/interdependence/tree-sitter-htmldjango";
|
||||
};
|
||||
@ -1033,12 +1033,12 @@
|
||||
};
|
||||
janet_simple = buildGrammar {
|
||||
language = "janet_simple";
|
||||
version = "0.0.0+rev=bd9cbaf";
|
||||
version = "0.0.0+rev=3c6f947";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sogaiu";
|
||||
repo = "tree-sitter-janet-simple";
|
||||
rev = "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6";
|
||||
hash = "sha256-2FucTi1wATBcomyNx2oCqMJVmAqLWHJiPQ2+L0VtwUM=";
|
||||
rev = "3c6f947f9039bbd803d9f3cf57dcee3783b3e2ce";
|
||||
hash = "sha256-wpiI0KQ4fy7fGTT3+oDfQy9zEuWmF5P/xSc1pLeA++I=";
|
||||
};
|
||||
meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple";
|
||||
};
|
||||
@ -1165,12 +1165,12 @@
|
||||
};
|
||||
kotlin = buildGrammar {
|
||||
language = "kotlin";
|
||||
version = "0.0.0+rev=5baa0fe";
|
||||
version = "0.0.0+rev=494fb76";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fwcd";
|
||||
repo = "tree-sitter-kotlin";
|
||||
rev = "5baa0fe2288830f88bd38e328b08d829f3914164";
|
||||
hash = "sha256-e2X8Hl8N8iTL0JUJhyyeebNPZ63QAq9C+R5F2lOYZKk=";
|
||||
rev = "494fb7644a9d2bbe4c7a0c5db2ef94d2aad6b0d8";
|
||||
hash = "sha256-AnUqNfqs8QMeiwltaVNnYGxEnqCeAyTi4nNEyUsH8F0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
|
||||
};
|
||||
@ -1220,12 +1220,12 @@
|
||||
};
|
||||
liquidsoap = buildGrammar {
|
||||
language = "liquidsoap";
|
||||
version = "0.0.0+rev=4620ab7";
|
||||
version = "0.0.0+rev=cff1fea";
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "tree-sitter-liquidsoap";
|
||||
rev = "4620ab746d1e9e5b6ebccaaa6afc5ebce06b4d75";
|
||||
hash = "sha256-M9HTG58WMvQ1PS7oRDeJ+bUwe+bmXf/fuTc6inEtkek=";
|
||||
rev = "cff1fea7c2ef9eed066a4d3de8af6cb4d7117056";
|
||||
hash = "sha256-WWq7aLFqjHnNe280u4+4SuqD+x73ww75fAE/Zm5ttAs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap";
|
||||
};
|
||||
@ -1408,6 +1408,28 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel";
|
||||
};
|
||||
nim = buildGrammar {
|
||||
language = "nim";
|
||||
version = "0.0.0+rev=1f9308c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alaviss";
|
||||
repo = "tree-sitter-nim";
|
||||
rev = "1f9308c9e440ddbc67c0aaeb9396c992d266b281";
|
||||
hash = "sha256-VgyZk6P2hMCySE8ZrYip7bVtP5OKdfRIgXESDmMgFBc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/alaviss/tree-sitter-nim";
|
||||
};
|
||||
nim_format_string = buildGrammar {
|
||||
language = "nim_format_string";
|
||||
version = "0.0.0+rev=d45f750";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aMOPel";
|
||||
repo = "tree-sitter-nim-format-string";
|
||||
rev = "d45f75022d147cda056e98bfba68222c9c8eca3a";
|
||||
hash = "sha256-hbM0JIxtZ3e2JUV4jXYO4RIO6r63nf2csvsLeIxkMn0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/aMOPel/tree-sitter-nim-format-string";
|
||||
};
|
||||
ninja = buildGrammar {
|
||||
language = "ninja";
|
||||
version = "0.0.0+rev=0a95cfd";
|
||||
@ -1512,12 +1534,12 @@
|
||||
};
|
||||
odin = buildGrammar {
|
||||
language = "odin";
|
||||
version = "0.0.0+rev=d165dbe";
|
||||
version = "0.0.0+rev=751f779";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-odin";
|
||||
rev = "d165dbee27617dab2653e38737d96ede1030d14f";
|
||||
hash = "sha256-NxF3aSDtXGMcE7v0BrYQbnUM/hophanKgsYX1ad8AFY=";
|
||||
rev = "751f7796fa76075cff52edd1afff569a8a09c2a7";
|
||||
hash = "sha256-VKcyuoXSRN4PAHQKzfuCKB9lg5y5MQyofy3FkN79Nrw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-odin";
|
||||
};
|
||||
@ -1567,23 +1589,23 @@
|
||||
};
|
||||
perl = buildGrammar {
|
||||
language = "perl";
|
||||
version = "0.0.0+rev=495ea4b";
|
||||
version = "0.0.0+rev=e99bb52";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter-perl";
|
||||
repo = "tree-sitter-perl";
|
||||
rev = "495ea4b2bb2ca7ebc64c598e4a60d8c0856b2811";
|
||||
hash = "sha256-6xLeT4dfBnxysrfW7kX3KyW96dfJgN4L040xI8IWVMU=";
|
||||
rev = "e99bb5283805db4cb86c964722d709df21b0ac16";
|
||||
hash = "sha256-PiQIHB94UYvm0fHeBcjJiegcfZ3Rqhs1lxusGdXQ5zI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl";
|
||||
};
|
||||
php = buildGrammar {
|
||||
language = "php";
|
||||
version = "0.0.0+rev=0e02e7f";
|
||||
version = "0.0.0+rev=33e3016";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-php";
|
||||
rev = "0e02e7fab7913a0e77343edb347c8f17cac1f0ba";
|
||||
hash = "sha256-cHXstpU5XaBv9vO59DKol7PfrVLc0olBLlhkb3wFNDE=";
|
||||
rev = "33e30169e6f9bb29845c80afaa62a4a87f23f6d6";
|
||||
hash = "sha256-xDk+zegvCef5O4uAF/DYzPLBQeFWwaqCTHjLUKK43Nc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
|
||||
};
|
||||
@ -1854,12 +1876,12 @@
|
||||
};
|
||||
rego = buildGrammar {
|
||||
language = "rego";
|
||||
version = "0.0.0+rev=b2667c9";
|
||||
version = "0.0.0+rev=9ac75e7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "FallenAngel97";
|
||||
repo = "tree-sitter-rego";
|
||||
rev = "b2667c975f07b33be3ceb83bea5cfbad88095866";
|
||||
hash = "sha256-y3w+gfjXb9N8Vf6ZrafP1j50Ap2KPaNfwo5h06EqHKM=";
|
||||
rev = "9ac75e71b2d791e0aadeef68098319d86a2a14cf";
|
||||
hash = "sha256-L6n6Z5y9t1ixpy9mktB9HVKy69jigqbIFB2SrSW/yoo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/FallenAngel97/tree-sitter-rego";
|
||||
};
|
||||
@ -2077,12 +2099,12 @@
|
||||
};
|
||||
sql = buildGrammar {
|
||||
language = "sql";
|
||||
version = "0.0.0+rev=caf2938";
|
||||
version = "0.0.0+rev=25be0b8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "derekstride";
|
||||
repo = "tree-sitter-sql";
|
||||
rev = "caf2938f1bc6b174e5bf5b6f3b5522cb723ee55b";
|
||||
hash = "sha256-PbbPp6CsnrFj7/OwF957MEbSf3PekXon7dMkcoHMO7c=";
|
||||
rev = "25be0b8f17e9189ad9e1b875869d025c5aec1286";
|
||||
hash = "sha256-ztiTMusfPkCpzqiEQt+HmkLt6gDhHt6dBdjIOb4ZBxs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
||||
};
|
||||
@ -2099,12 +2121,12 @@
|
||||
};
|
||||
ssh_config = buildGrammar {
|
||||
language = "ssh_config";
|
||||
version = "0.0.0+rev=e400863";
|
||||
version = "0.0.0+rev=9dcfe0f";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ObserverOfTime";
|
||||
repo = "tree-sitter-ssh-config";
|
||||
rev = "e4008633536870f3fed3198c96503250af0b0a12";
|
||||
hash = "sha256-jPEJQgFys+gwwLiIXmhHvrsT9ai0R7wXJVxRQANACkI=";
|
||||
rev = "9dcfe0f30ccbde8115790c72acbde4c04ec8e74e";
|
||||
hash = "sha256-X7zfOxOVZ99vbCqRSt3rhtiaolByRPspldu9XF1B/XY=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config";
|
||||
};
|
||||
@ -2121,12 +2143,12 @@
|
||||
};
|
||||
strace = buildGrammar {
|
||||
language = "strace";
|
||||
version = "0.0.0+rev=0dc85e4";
|
||||
version = "0.0.0+rev=d819cdd";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigmaSd";
|
||||
repo = "tree-sitter-strace";
|
||||
rev = "0dc85e4cfcd0cc4b33f855ddb782d81d1297bf6e";
|
||||
hash = "sha256-JK5+HlCELcBD2Af4uNNoBMYecDGnwcoTqdZr5mKBq+Q=";
|
||||
rev = "d819cdd5dbe455bd3c859193633c8d91c0df7c36";
|
||||
hash = "sha256-u2LznohljEq7WEoVbwr1ZyV+qbchDuoktJFCeh4iePg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/sigmaSd/tree-sitter-strace";
|
||||
};
|
||||
@ -2199,12 +2221,12 @@
|
||||
};
|
||||
t32 = buildGrammar {
|
||||
language = "t32";
|
||||
version = "0.0.0+rev=b075f2f";
|
||||
version = "0.0.0+rev=884a034";
|
||||
src = fetchFromGitLab {
|
||||
owner = "xasc";
|
||||
repo = "tree-sitter-t32";
|
||||
rev = "b075f2f55ba29edce51b6b6b9f234ce3988dbb0a";
|
||||
hash = "sha256-NoJLMzyQmE4XpI1KKyq5GkkotOl8MU/zniTnP2nkjes=";
|
||||
rev = "884a034e0ae29ce72649041a603deacdfb4a3275";
|
||||
hash = "sha256-BGux3rIBOkZl7sKAjATjeVLhDXoL7kBvX5sACoceyWY=";
|
||||
};
|
||||
meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git";
|
||||
};
|
||||
@ -2346,12 +2368,12 @@
|
||||
};
|
||||
twig = buildGrammar {
|
||||
language = "twig";
|
||||
version = "0.0.0+rev=779ee5a";
|
||||
version = "0.0.0+rev=eaf80e6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gbprod";
|
||||
repo = "tree-sitter-twig";
|
||||
rev = "779ee5ab1e065dcef7f51f253030dc875445b25f";
|
||||
hash = "sha256-4De6ETY0oqbvMXtTDyd1vwheJdfuIusNHjyqyspsz2A=";
|
||||
rev = "eaf80e6af969e25993576477a9dbdba3e48c1305";
|
||||
hash = "sha256-fp7HcdJEFxi/zBFSrM86THwBMpqFwAGugcTVbPk3bd4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/gbprod/tree-sitter-twig";
|
||||
};
|
||||
@ -2367,6 +2389,17 @@
|
||||
location = "typescript";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
|
||||
};
|
||||
typoscript = buildGrammar {
|
||||
language = "typoscript";
|
||||
version = "0.0.0+rev=43b221c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Teddytrombone";
|
||||
repo = "tree-sitter-typoscript";
|
||||
rev = "43b221c0b76e77244efdaa9963e402a17c930fbc";
|
||||
hash = "sha256-7ottrupSWC83rDP59yceDG/TuikNHoyCBnAlns/x6Tc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Teddytrombone/tree-sitter-typoscript";
|
||||
};
|
||||
ungrammar = buildGrammar {
|
||||
language = "ungrammar";
|
||||
version = "0.0.0+rev=debd26f";
|
||||
@ -2380,12 +2413,12 @@
|
||||
};
|
||||
unison = buildGrammar {
|
||||
language = "unison";
|
||||
version = "0.0.0+rev=694c8c0";
|
||||
version = "0.0.0+rev=a69d087";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kylegoetz";
|
||||
repo = "tree-sitter-unison";
|
||||
rev = "694c8c0c79f8d1b80d497401acf4d1b77bfb004a";
|
||||
hash = "sha256-g8g/YUKabxWwN+w0akMYMu0fFOkUHGAN44CVDOfPqI4=";
|
||||
rev = "a69d087590f2ca057d1ef1a393de7e22869bb557";
|
||||
hash = "sha256-9eDWvNkY3rEz6khluAJuTXF95CF384IRptaRXGOHma4=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison";
|
||||
@ -2514,12 +2547,12 @@
|
||||
};
|
||||
wing = buildGrammar {
|
||||
language = "wing";
|
||||
version = "0.0.0+rev=8abdb5e";
|
||||
version = "0.0.0+rev=61ed52f";
|
||||
src = fetchFromGitHub {
|
||||
owner = "winglang";
|
||||
repo = "wing";
|
||||
rev = "8abdb5e1846a56004bcba6e1d9a735e22bb5fff4";
|
||||
hash = "sha256-Pmj7Tk9GSeRNIvWODo9StI1c0Hx35B/G15r4kGvErgs=";
|
||||
rev = "61ed52fa76a1797b7d22b831959b3abbbfdb7a05";
|
||||
hash = "sha256-SE4BKB1IKsvNFeqrLAzajSfB9dbLQlSSvSpzOBNChcQ=";
|
||||
};
|
||||
location = "libs/tree-sitter-wing";
|
||||
generate = true;
|
||||
|
||||
@ -470,6 +470,7 @@ https://github.com/jakewvincent/mkdnflow.nvim/,HEAD,
|
||||
https://github.com/SidOfc/mkdx/,,
|
||||
https://github.com/mawkler/modicator.nvim/,HEAD,
|
||||
https://github.com/tomasr/molokai/,,
|
||||
https://github.com/benlubas/molten-nvim/,HEAD,
|
||||
https://github.com/loctvl842/monokai-pro.nvim/,HEAD,
|
||||
https://github.com/shaunsingh/moonlight.nvim/,,pure-lua
|
||||
https://github.com/leafo/moonscript-vim/,HEAD,
|
||||
|
||||
@ -760,7 +760,7 @@ in
|
||||
# causes redefinition of _FORTIFY_SOURCE
|
||||
hardeningDisable = [ "fortify3" ];
|
||||
|
||||
postBuild = "cd $NIX_BUILD_TOP/source/build/pcsx2";
|
||||
postBuild = "cd pcsx2";
|
||||
meta = {
|
||||
description = "Port of PCSX2 to libretro";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "azpainter";
|
||||
version = "3.0.6";
|
||||
version = "3.0.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "azelpg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/shmLdZ4mCBZAeUuqJtCiUjeI8B5f/8dIGPqmXMjZ1I=";
|
||||
hash = "sha256-RlsiN9pefpTYUh4M8j4Ty/Ipi9StoVcNcICd7QDirhI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,39 +1,39 @@
|
||||
{
|
||||
stable = {
|
||||
chromedriver = {
|
||||
hash_darwin = "sha256-ugsxRhIPtDD7Y4/PsIc8Apqrtyo4uiVKoLmtRvQaJ3k=";
|
||||
hash_darwin = "sha256-sRAU9RJANz+Sov6oaoZasMoaqM+mIZSDbag92wXsVCI=";
|
||||
hash_darwin_aarch64 =
|
||||
"sha256-aD/bHIxMm1OQu6un8cTYLPWoq/cC6kd1hTkxLEqGGRM=";
|
||||
hash_linux = "sha256-Ie5wtKXz27/vI97Ku7dqqQicR+tujgFUzANAIKTRw8M=";
|
||||
version = "118.0.5993.70";
|
||||
"sha256-U+PBsfpc7PNZYedHIdPnWXA9xKpRnon5vxgKKJr69ow=";
|
||||
hash_linux = "sha256-2o6LAo2pEsCi1exPv1nEMk2Tklhh49UyWaYoyQ7Df/Y=";
|
||||
version = "119.0.6045.105";
|
||||
};
|
||||
deps = {
|
||||
gn = {
|
||||
hash = "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M=";
|
||||
rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4";
|
||||
hash = "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4=";
|
||||
rev = "991530ce394efb58fcd848195469022fa17ae126";
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
version = "2023-08-10";
|
||||
version = "2023-09-12";
|
||||
};
|
||||
};
|
||||
hash = "sha256-65rN17DIF+9FgZu7ohc9dM8ni6Qmqc9l1oyOcloip44=";
|
||||
hash_deb_amd64 = "sha256-RJcyIA0TdXWRk+K2GVcHSv4OSq5c6Y7InUblao3uusc=";
|
||||
version = "118.0.5993.117";
|
||||
hash = "sha256-sVBZ0FnaJg1P9a2X8N1MSs8ehPSPzgfbhprb+4v0gXA=";
|
||||
hash_deb_amd64 = "sha256-WLTTFMUvtBHvvegDFpZ+7Eht9StMyleaqXEBhPhgPTs=";
|
||||
version = "119.0.6045.105";
|
||||
};
|
||||
ungoogled-chromium = {
|
||||
deps = {
|
||||
gn = {
|
||||
hash = "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M=";
|
||||
rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4";
|
||||
hash = "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4=";
|
||||
rev = "991530ce394efb58fcd848195469022fa17ae126";
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
version = "2023-08-10";
|
||||
version = "2023-09-12";
|
||||
};
|
||||
ungoogled-patches = {
|
||||
hash = "sha256-10kSaLteFtvg3nGffslRpAxmc7nFsp0rA8gwm8jqt/8=";
|
||||
rev = "118.0.5993.117-1";
|
||||
hash = "sha256-+1ln5xD+VwhB+f64rnSXeNOYmhbnm6Kb2xBe5Aanxkc=";
|
||||
rev = "119.0.6045.105-1";
|
||||
};
|
||||
};
|
||||
hash = "sha256-65rN17DIF+9FgZu7ohc9dM8ni6Qmqc9l1oyOcloip44=";
|
||||
hash_deb_amd64 = "sha256-RJcyIA0TdXWRk+K2GVcHSv4OSq5c6Y7InUblao3uusc=";
|
||||
version = "118.0.5993.117";
|
||||
hash = "sha256-sVBZ0FnaJg1P9a2X8N1MSs8ehPSPzgfbhprb+4v0gXA=";
|
||||
hash_deb_amd64 = "sha256-WLTTFMUvtBHvvegDFpZ+7Eht9StMyleaqXEBhPhgPTs=";
|
||||
version = "119.0.6045.105";
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,17 +15,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
inherit pname;
|
||||
version = "2.3.1";
|
||||
version = "2.4.3";
|
||||
tags = lib.optionals enableGateway [ "gateway" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kumahq";
|
||||
repo = "kuma";
|
||||
rev = version;
|
||||
hash = "sha256-BayfHBTTqgc0ArD6ux9HOqaZy0GrEpqgDa7zHZtiG2I=";
|
||||
hash = "sha256-MAruZVXkokwiRIIo84dikIEUuYYJLgTDl4Zgivrltyk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-St+jGks7ojKrgecmN7UJ9FjGrmjtgEKsunSY+4itUyA=";
|
||||
vendorHash = "sha256-F428xc4YeTtBMlTEUdEdbLwtm2MPpCkDib/dgRTT/3Y=";
|
||||
|
||||
# no test files
|
||||
doCheck = false;
|
||||
|
||||
@ -26,13 +26,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "haruna";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "multimedia";
|
||||
repo = "haruna";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-x3tgH2eoLVELQKbgNLvJPGQsay8iOfMY/BGLOEov3OM=";
|
||||
hash = "sha256-6UXgAb42DttNgmO5KRFC5M6kuYrv+GIxQ0EQ4P5cgUI=";
|
||||
domain = "invent.kde.org";
|
||||
};
|
||||
|
||||
|
||||
@ -44,8 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Use /run/current-system/sw/share and /etc instead of /nix/store
|
||||
# references:
|
||||
./sway-config-nixos-paths.patch
|
||||
# Drop ambient capabilities after getting SCHED_RR
|
||||
./drop_ambient_capabilities.patch
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
From e7d9098e81289ae99d07ec3eac1fec1d303b8fe4 Mon Sep 17 00:00:00 2001
|
||||
From: Thiago Kenji Okada <thiagokokada@gmail.com>
|
||||
Date: Thu, 5 Oct 2023 15:23:35 +0100
|
||||
Subject: [PATCH] drop ambient capabilities
|
||||
|
||||
Within NixOS the only possibility to gain cap_sys_nice is using the
|
||||
security.wrapper infrastructure. However to pass the capabilities to the
|
||||
wrapped program, they are raised to the ambient set. To fix this we make
|
||||
sure to drop the ambient capabilities during sway startup and realtime
|
||||
setup. Otherwise all programs started by sway also gain cap_sys_nice,
|
||||
which is not something we want.
|
||||
|
||||
Co-authored-by: Rouven Czerwinski <rouven@czerwinskis.de>
|
||||
---
|
||||
sway/realtime.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/sway/realtime.c b/sway/realtime.c
|
||||
index 11154af0..06f872a8 100644
|
||||
--- a/sway/realtime.c
|
||||
+++ b/sway/realtime.c
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <unistd.h>
|
||||
#include <pthread.h>
|
||||
#include "sway/server.h"
|
||||
+#include "sys/prctl.h"
|
||||
#include "log.h"
|
||||
|
||||
static void child_fork_callback(void) {
|
||||
@@ -10,6 +11,8 @@ static void child_fork_callback(void) {
|
||||
|
||||
param.sched_priority = 0;
|
||||
|
||||
+ prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_CLEAR_ALL, 0, 0, 0);
|
||||
+
|
||||
int ret = pthread_setschedparam(pthread_self(), SCHED_OTHER, ¶m);
|
||||
if (ret != 0) {
|
||||
sway_log(SWAY_ERROR, "Failed to reset scheduler policy on fork");
|
||||
--
|
||||
2.42.0
|
||||
|
||||
33
pkgs/by-name/bo/borealis-cursors/package.nix
Normal file
33
pkgs/by-name/bo/borealis-cursors/package.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "borealis-cursors";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alvatip";
|
||||
repo = "Borealis-cursors";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-1qgyU0Npbx/AgqGbmF/BWtlVC0KsKtgC48SL/HtkDrk=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/icons
|
||||
cp -a Borealis-cursors $out/share/icons
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cursor theme using a custom color palette inspired by boreal colors";
|
||||
homepage = "https://www.gnome-look.org/s/Gnome/p/1717914";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ argrat ];
|
||||
};
|
||||
})
|
||||
@ -27,13 +27,13 @@
|
||||
assert installExperimentalTools -> (!stdenv.hostPlatform.isMusl);
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "composefs";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "composefs";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-OjayMhLc3otqQjHsbLN8nm9D9yGOifBcrSLixjnJmvE=";
|
||||
hash = "sha256-8YbDKw4jYEU6l3Nmqu3gsT9VX0lwYF/39hhcwzgTynY=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@ -75,9 +75,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# MUSL: https://github.com/containers/composefs/issues/204
|
||||
substituteInPlace tests/Makefile \
|
||||
--replace " check-checksums" ""
|
||||
'' + lib.optionalString (stdenv.hostPlatform.isMusl || enableValgrindCheck) ''
|
||||
# seccomp sandbox breaks these tests
|
||||
# MUSL: https://github.com/containers/composefs/issues/206
|
||||
'' + lib.optionalString enableValgrindCheck ''
|
||||
# valgrind is incompatible with seccomp
|
||||
substituteInPlace tests/test-checksums.sh \
|
||||
--replace "composefs-from-json" "composefs-from-json --no-sandbox"
|
||||
'';
|
||||
|
||||
53
pkgs/by-name/me/mercure/package.nix
Normal file
53
pkgs/by-name/me/mercure/package.nix
Normal file
@ -0,0 +1,53 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, testers
|
||||
, mercure
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mercure";
|
||||
version = "0.15.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dunglas";
|
||||
repo = "mercure";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DyKNKhxjnOfxYcp3w1nB6kxs9c4ZaHL0AN0Eb5vc6mA=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/caddy";
|
||||
|
||||
vendorHash = "sha256-2SZv6iwEZjq/50WwwupfHjbg0vNpff/Cn21nPqeHJMw=";
|
||||
|
||||
subPackages = [ "mercure" ];
|
||||
excludedPackages = [ "../cmd/mercure" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X 'github.com/caddyserver/caddy/v2.CustomVersion=Mercure.rocks v${version} Caddy'"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
version = "v${version}";
|
||||
package = mercure;
|
||||
command = "mercure version";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open, easy, fast, reliable and battery-efficient solution for real-time communications";
|
||||
homepage = "https://github.com/dunglas/mercure";
|
||||
changelog = "https://github.com/dunglas/mercure/releases/tag/v${version}";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ gaelreyrol ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "mercure";
|
||||
};
|
||||
}
|
||||
@ -4,7 +4,6 @@
|
||||
, fetchFromGitLab
|
||||
, cairo
|
||||
, cmake
|
||||
, pcre
|
||||
, boost
|
||||
, cups-filters
|
||||
, curl
|
||||
@ -20,7 +19,6 @@
|
||||
, pkg-config
|
||||
, python3
|
||||
, scribus
|
||||
, texlive
|
||||
, zlib
|
||||
, withData ? true, poppler_data
|
||||
, qt5Support ? false, qt6Support ? false, qtbase ? null
|
||||
@ -66,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: rec {
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
pcre
|
||||
libiconv
|
||||
libintl
|
||||
] ++ lib.optionals withData [
|
||||
|
||||
@ -184,12 +184,12 @@ let
|
||||
# simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01
|
||||
baseScope = lib.makeScope newScope addPackages;
|
||||
|
||||
bootstrapScope = baseScope.overrideScope'(final: prev: {
|
||||
bootstrapScope = baseScope.overrideScope(final: prev: {
|
||||
qtbase = prev.qtbase.override { qttranslations = null; };
|
||||
qtdeclarative = null;
|
||||
});
|
||||
|
||||
finalScope = baseScope.overrideScope'(final: prev: {
|
||||
finalScope = baseScope.overrideScope(final: prev: {
|
||||
qttranslations = bootstrapScope.qttranslations;
|
||||
});
|
||||
in finalScope
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botorch";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8obS+qMQwepKUxPkMbufR/SaacYekl6FA6t6XW6llA4=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-d8EMmA499Zxyagkqx0JCKMZPwSH4LvBya+raD3v3iZU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
79
pkgs/development/python-modules/cf-xarray/default.nix
Normal file
79
pkgs/development/python-modules/cf-xarray/default.nix
Normal file
@ -0,0 +1,79 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, dask
|
||||
, fetchFromGitHub
|
||||
, matplotlib
|
||||
, pint
|
||||
, pooch
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, regex
|
||||
, rich
|
||||
, scipy
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, shapely
|
||||
, wheel
|
||||
, xarray
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cf-xarray";
|
||||
version = "0.8.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xarray-contrib";
|
||||
repo = "cf-xarray";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qcoHz/yZoPVu0uBKKx4AV7MOokiuXSCaWPD/92VlRFk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
wheel
|
||||
xarray
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
xarray
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
all = [
|
||||
matplotlib
|
||||
pint
|
||||
pooch
|
||||
regex
|
||||
rich
|
||||
shapely
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
dask
|
||||
pytestCheckHook
|
||||
scipy
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [
|
||||
"cf_xarray"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Tests require network access
|
||||
"cf_xarray/tests/test_accessor.py"
|
||||
"cf_xarray/tests/test_helpers.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An accessor for xarray objects that interprets CF attributes";
|
||||
homepage = "https://github.com/xarray-contrib/cf-xarray";
|
||||
changelog = "https://github.com/xarray-contrib/cf-xarray/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.148";
|
||||
version = "2.1.149";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XRER28ObI9TsZ5h5LkAXhExGq+c4hpoEun2hagkpUXk=";
|
||||
hash = "sha256-C3RR0WUq63O875v23TQ8GwPGTgGuOqhYhwtfkCMFBfE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyinstrument";
|
||||
version = "4.5.3";
|
||||
version = "4.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "joerick";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rGjHVbIl0kXgscKNZ/U1AU3Ij9Y+iOpIXnmO4jeb3jI=";
|
||||
hash = "sha256-NSE2mZPbKmvlQbBPx0MoqYfAOjmsf9CllX7dxygZfc4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
{ lib
|
||||
, stdenv
|
||||
, ansible-core
|
||||
, buildPythonPackage
|
||||
, coreutils
|
||||
, coverage
|
||||
, fetchFromGitHub
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
@ -15,16 +14,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-ansible";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ansible";
|
||||
repo = pname;
|
||||
repo = "pytest-ansible";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TV/dR4eTiwjrgamwRCig10acaf3MpAzLu0fHF0V2pzw=";
|
||||
hash = "sha256-51DQ+NwD454XaYLuRxriuWRZ8uTSX3ZpadXdxs7FspQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -49,7 +48,6 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
coverage
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@ -74,7 +72,10 @@ buildPythonPackage rec {
|
||||
"test_param_override_with_marker"
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals stdenv.isDarwin [
|
||||
disabledTestPaths = [
|
||||
# Test want s to execute pytest in a subprocess
|
||||
"tests/integration/test_molecule.py"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# These tests fail in the Darwin sandbox
|
||||
"tests/test_adhoc.py"
|
||||
"tests/test_adhoc_result.py"
|
||||
@ -85,7 +86,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plugin for py.test to simplify calling ansible modules from tests or fixtures";
|
||||
description = "Plugin for pytest to simplify calling ansible modules from tests or fixtures";
|
||||
homepage = "https://github.com/jlaska/pytest-ansible";
|
||||
changelog = "https://github.com/ansible-community/pytest-ansible/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
|
||||
@ -80,6 +80,11 @@ buildPythonPackage rec {
|
||||
export HOME="$TMPDIR"
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError: False is not true
|
||||
"TestHDF5_Format"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Features previously in QCoDeS";
|
||||
homepage = "https://github.com/QCoDeS/Qcodes_loop";
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, versioningit
|
||||
, wheel
|
||||
|
||||
# mandatory
|
||||
, broadbean
|
||||
, buildPythonPackage
|
||||
, cf-xarray
|
||||
, dask
|
||||
, deepdiff
|
||||
, fetchPypi
|
||||
, h5netcdf
|
||||
, h5py
|
||||
, hypothesis
|
||||
, importlib-metadata
|
||||
, ipywidgets
|
||||
, ipykernel
|
||||
, ipython
|
||||
, ipywidgets
|
||||
, jsonschema
|
||||
, lxml
|
||||
, matplotlib
|
||||
, numpy
|
||||
, opencensus
|
||||
@ -21,54 +21,44 @@
|
||||
, opentelemetry-api
|
||||
, packaging
|
||||
, pandas
|
||||
, pyvisa
|
||||
, ruamel-yaml
|
||||
, tabulate
|
||||
, typing-extensions
|
||||
, tqdm
|
||||
, uncertainties
|
||||
, websockets
|
||||
, wrapt
|
||||
, xarray
|
||||
, ipython
|
||||
, pillow
|
||||
, rsa
|
||||
|
||||
# optional
|
||||
, qcodes-loop
|
||||
, slack-sdk
|
||||
|
||||
# test
|
||||
, pip
|
||||
, pytestCheckHook
|
||||
, deepdiff
|
||||
, hypothesis
|
||||
, lxml
|
||||
, pytest-asyncio
|
||||
, pytest-mock
|
||||
, pytest-rerunfailures
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyvisa
|
||||
, pyvisa-sim
|
||||
, qcodes-loop
|
||||
, rsa
|
||||
, ruamel-yaml
|
||||
, setuptools
|
||||
, sphinx
|
||||
, tabulate
|
||||
, tqdm
|
||||
, typing-extensions
|
||||
, uncertainties
|
||||
, versioningit
|
||||
, websockets
|
||||
, wheel
|
||||
, wrapt
|
||||
, xarray
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qcodes";
|
||||
version = "0.40.0";
|
||||
version = "0.41.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-C8/ltX3tSxCbbheuel3BjIkRBl/E92lK709QYx+2FL0=";
|
||||
hash = "sha256-3Ncg51E4KYbvzlEyesVbTmzmz+UPfFkj3tudVbNYqHQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'versioningit ~=' 'versioningit >='
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
versioningit
|
||||
@ -77,6 +67,8 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
broadbean
|
||||
cf-xarray
|
||||
dask
|
||||
h5netcdf
|
||||
h5py
|
||||
ipykernel
|
||||
@ -109,13 +101,8 @@ buildPythonPackage rec {
|
||||
loop = [
|
||||
qcodes-loop
|
||||
];
|
||||
slack = [
|
||||
slack-sdk
|
||||
];
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
deepdiff
|
||||
hypothesis
|
||||
@ -130,6 +117,8 @@ buildPythonPackage rec {
|
||||
sphinx
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
pytestFlagsArray = [
|
||||
# Follow upstream with settings
|
||||
"--durations=20"
|
||||
@ -138,6 +127,8 @@ buildPythonPackage rec {
|
||||
disabledTestPaths = [
|
||||
# Test depends on qcodes-loop, causing a cyclic dependency
|
||||
"qcodes/tests/dataset/measurement/test_load_legacy_data.py"
|
||||
# TypeError
|
||||
"qcodes/tests/dataset/test_dataset_basic.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
@ -161,8 +152,8 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/v${version}";
|
||||
description = "Python-based data acquisition framework";
|
||||
changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/v${version}";
|
||||
downloadPage = "https://github.com/QCoDeS/Qcodes";
|
||||
homepage = "https://qcodes.github.io/Qcodes/";
|
||||
license = licenses.mit;
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
{ lib
|
||||
, asyncclick
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, oauthlib
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytest-mock
|
||||
, pytest-socket
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pytz
|
||||
@ -13,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ring-doorbell";
|
||||
version = "0.7.4";
|
||||
version = "0.7.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +25,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "ring_doorbell";
|
||||
inherit version;
|
||||
hash = "sha256-hto3MwlC6ADjKkcB/4l/uFyw+0CgvLZM0sp3FF62XUA=";
|
||||
hash = "sha256-chhZj9yr/MCbvh3wo8RTqtyyt1Mj22ku4aRMK2c8Efc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -29,6 +33,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asyncclick
|
||||
oauthlib
|
||||
pytz
|
||||
requests
|
||||
@ -36,6 +41,9 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytest-socket
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
];
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "gdm";
|
||||
version = "1.4";
|
||||
|
||||
goPackagePath = "github.com/sparrc/gdm";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sparrc";
|
||||
repo = "gdm";
|
||||
rev = version;
|
||||
sha256 = "0kpqmbg144qcvd8k88j9yx9lrld85ray2viw161xajafk16plvld";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Minimalist dependency manager for Go written in Go";
|
||||
homepage = "https://github.com/sparrc/gdm";
|
||||
license = licenses.unlicense;
|
||||
maintainers = [ maintainers.mic92 ];
|
||||
};
|
||||
}
|
||||
@ -1,17 +1,19 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, testers
|
||||
, devspace
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "devspace";
|
||||
version = "6.3.3";
|
||||
version = "6.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "loft-sh";
|
||||
owner = "devspace-sh";
|
||||
repo = "devspace";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xAK06bpl8BGsVUu6O1C2l+tzeiCQoRUMIUtwntUZVvU=";
|
||||
hash = "sha256-AKEa9LDe1bLJxJH5k4axALoWkTh+bkBviCpof7x7+fY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@ -26,10 +28,14 @@ buildGoModule rec {
|
||||
# TODO: add a nixosTest to be able to perform the package check
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = devspace;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "DevSpace is an open-source developer tool for Kubernetes that lets you develop and deploy cloud-native software faster";
|
||||
description = "An open-source developer tool for Kubernetes that lets you develop and deploy cloud-native software faster";
|
||||
homepage = "https://devspace.sh/";
|
||||
changelog = "https://github.com/loft-sh/devspace/releases/tag/v${version}";
|
||||
changelog = "https://github.com/devspace-sh/devspace/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ darkonion0 ];
|
||||
};
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fastly";
|
||||
version = "10.5.1";
|
||||
version = "10.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YNXsO0iuVyITgvYwLUm83BA2Y+hUcQe9pK9ppy8pVRQ=";
|
||||
hash = "sha256-O71stl9vLbeNOtW9XeUuKSpB2JmnM4sawN+iFoTJHas=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
@ -33,7 +33,7 @@ buildGoModule rec {
|
||||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-oB71R7MUBG7EgVhaWx5oNGLHVGQWhkxO7jJD9eFsc3Y=";
|
||||
vendorHash = "sha256-g4cUjvFH5F/GfABgG2GKS04XlyJuM+xJ3oQAqT3xjis=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
@ -52,8 +52,8 @@ buildGoModule rec {
|
||||
];
|
||||
preBuild = let
|
||||
cliConfigToml = fetchurl {
|
||||
url = "https://web.archive.org/web/20230523192914/https://developer.fastly.com/api/internal/cli-config";
|
||||
hash = "sha256-zgZ3m69dRvuc1S7hHeLxzrM/Z/u0PKUn0XbyQOYO3es=";
|
||||
url = "https://web.archive.org/web/20231104101556/https://developer.fastly.com/api/internal/cli-config";
|
||||
hash = "sha256-Bi5hbmMyFP4Pv2MklwNdkhGLXbI5qf6Ibvj0vWok2tI=";
|
||||
};
|
||||
in ''
|
||||
cp ${cliConfigToml} ./pkg/config/config.toml
|
||||
|
||||
48
pkgs/os-specific/linux/pam_mktemp/default.nix
Normal file
48
pkgs/os-specific/linux/pam_mktemp/default.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pam
|
||||
, e2fsprogs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pam_mktemp";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://openwall.com/pam/modules/${pname}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-Zs+AwYQ5yjRW25ZALy7qwUsaBQPMHRvn8rFtXwefPz0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "inherit_private_prefix_from_home.patch";
|
||||
url = "https://git.altlinux.org/gears/p/pam_mktemp.git?p=pam_mktemp.git;a=commitdiff_plain;h=3d2e8ad6da6a44c047bf7a8afa1e1bb2a6e36a55";
|
||||
hash = "sha256-xe44fi2xH9jqlStlIR4QPB0KS7spflRdOsvNPEmxJpU";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "allow_private_prefix_to_be_stricter.patch";
|
||||
url = "https://git.altlinux.org/gears/p/pam_mktemp.git?p=pam_mktemp.git;a=commitdiff_plain;h=bb2cee0c695d22310e5364c30d74bccb0dbf3205";
|
||||
hash = "sha256-TouysUVlNnl+m7lJ2VKPxUTYD2om1Jh5FEJ6NHMAI4U=";
|
||||
})
|
||||
];
|
||||
|
||||
patchFlags = "-p2";
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
buildInputs = [ pam e2fsprogs ];
|
||||
|
||||
makeFlags = [ "DESTDIR=$(out)" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.openwall.com/pam/";
|
||||
description = "PAM for login service to provide per-user private directories";
|
||||
license = licenses.bsd0;
|
||||
maintainers = with maintainers; [ wladmis ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -6,20 +6,21 @@
|
||||
, stdenv
|
||||
, CoreServices
|
||||
, Security
|
||||
, SystemConfiguration
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hop-cli";
|
||||
version = "0.2.54";
|
||||
version = "0.2.60";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hopinc";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0BIPN4+XYZgUdxygpKpWZq6VkWWNCFD8v5egXOYfC64=";
|
||||
hash = "sha256-zNAV9WdtRBlCh7Joky5Dl+cw/FpY1m/WJxUoNikmXvQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KE7AAyArRang/EZrpgv+vlNZaAP/Y2pCltiPMgZ5vFA=";
|
||||
cargoHash = "sha256-1QD6mEXRw3NCTBKJyVGK3demLKUdE6smELpvdFSJiWY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@ -28,7 +29,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreServices Security
|
||||
CoreServices Security SystemConfiguration
|
||||
];
|
||||
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
version = "1.7.16";
|
||||
version = "1.7.17";
|
||||
pname = "ossutil";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aliyun";
|
||||
repo = "ossutil";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-J6t8QoyCvbGrUX2AkdqugztchP7Cc0jZsrn1+OB2hVY=";
|
||||
hash = "sha256-5Z0mMgDYexUQAcngeEd0m5J5kRwWTGIS2Q+idBcTV98=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oxhi27Zt91S2RwidM+BPati/HWuP8FrZs1X2R2Px5hI=";
|
||||
vendorHash = "sha256-4a/bNH47sxxwgYYQhHTqyXddJit3VbeM49/4IEfjWsY=";
|
||||
|
||||
# don't run tests as they require secret access keys that only travis has
|
||||
doCheck = false;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "panoply";
|
||||
version = "5.2.9";
|
||||
version = "5.2.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
|
||||
sha256 = "sha256-InnHiaPvSCCtRmWStyrYQMhNQnoG+lhSBe7ECrPFKFc=";
|
||||
sha256 = "sha256-en/CAmk9Rj2MrUF5vfsZu1fUDJFaAifL7PYgUT3Uu8k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rabtap";
|
||||
version = "1.38.2";
|
||||
version = "1.39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jandelgado";
|
||||
repo = "rabtap";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-l35MHr7NWBlzKcGSDGjHTwGfnDrOpjeJp9/YAp1Areo=";
|
||||
sha256 = "sha256-/inclOpKYlEGSEH390+GtRiHXotaH+VxqWVAWSf61Xs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sJFMef9VnU6iKGf9UwEK60axLUBkubFWgI+pWKjaWNU=";
|
||||
vendorHash = "sha256-BrpDafEFDrH243zDHY9EtkVjPvwrmbJVu5TQMHHOWfA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "RabbitMQ wire tap and swiss army knife";
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
let
|
||||
pname = "zerotierone";
|
||||
version = "1.12.1";
|
||||
version = "1.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zerotier";
|
||||
repo = "ZeroTierOne";
|
||||
rev = version;
|
||||
sha256 = "sha256-430wdPrSNohM3sXewusjsW3tbE7EFGISGxABZF21yRc=";
|
||||
sha256 = "sha256-p0zrYgbHTLefj5GTrMnYLytCXZ/nRuqTL+6dEeC+uVw=";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
|
||||
@ -1,23 +1,30 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gowitness";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sensepost";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-rylft6v6Np8xOm2AUtH7e/zDZQ87WNPeerXEtziSrDw=";
|
||||
repo = "gowitness";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-37OorjzxDu27FNAz4LTtQdFjt0tL9jSb9tGZhlq797Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-l6jdVsKKLqEyFpz7JhkLLjVTWX1pZenlCY5UqSZVMdc=";
|
||||
vendorHash = "sha256-Exw5NfR3nDYH+hWMPOKuVIRyrVkOJyP7Kwe4jzQwnsI=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Web screenshot utility";
|
||||
homepage = "https://github.com/sensepost/gowitness";
|
||||
changelog = "https://github.com/sensepost/gowitness/releases/tag/${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jumppad";
|
||||
version = "0.5.51";
|
||||
version = "0.5.53";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jumppad-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Az/rNkGwwrYZfay+KjINjIT2PNsoGDNCwZnXZTeKqM4=";
|
||||
hash = "sha256-93KTi7m+7zS6hSIF4dA995Z8jUdmE5u3O8ytCLsEqdE=";
|
||||
};
|
||||
vendorHash = "sha256-onUs7ZbnzJGbs+Q+1jvqUp9y9ecOxhtcdx/fkxZntmc=";
|
||||
vendorHash = "sha256-o3jA1gVKW6KUHzy5zZO4aaGVoCBFN96hbK0/usQ32fw=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X main.version=${version}"
|
||||
|
||||
@ -275,6 +275,7 @@ mapAliases ({
|
||||
geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10
|
||||
geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10
|
||||
ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18
|
||||
go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04
|
||||
git-subset = throw "'git-subset' has been removed in favor of 'git-filter-repo'"; # Added 2023-01-13
|
||||
|
||||
gitAndTools = self // {
|
||||
|
||||
@ -5514,8 +5514,6 @@ with pkgs;
|
||||
|
||||
go-2fa = callPackage ../tools/security/2fa { };
|
||||
|
||||
go-dependency-manager = callPackage ../development/tools/gdm { };
|
||||
|
||||
go-neb = callPackage ../applications/networking/instant-messengers/go-neb { };
|
||||
|
||||
google-cursor = callPackage ../data/icons/google-cursor { };
|
||||
@ -16387,7 +16385,7 @@ with pkgs;
|
||||
hop = callPackage ../development/compilers/hop { };
|
||||
|
||||
hop-cli = callPackage ../tools/admin/hop-cli {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
|
||||
};
|
||||
|
||||
falcon = callPackage ../development/interpreters/falcon {
|
||||
@ -28570,6 +28568,8 @@ with pkgs;
|
||||
|
||||
pam_ldap = callPackage ../os-specific/linux/pam_ldap { };
|
||||
|
||||
pam_mktemp = callPackage ../os-specific/linux/pam_mktemp { };
|
||||
|
||||
pam_mount = callPackage ../os-specific/linux/pam_mount { };
|
||||
|
||||
pam_mysql = callPackage ../os-specific/linux/pam_mysql { };
|
||||
|
||||
@ -832,7 +832,7 @@ let
|
||||
};
|
||||
|
||||
ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { };
|
||||
})).overrideScope' liftJaneStreet;
|
||||
})).overrideScope liftJaneStreet;
|
||||
|
||||
janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix {
|
||||
self = self.janeStreet_0_9_0;
|
||||
@ -1967,7 +1967,7 @@ in let inherit (pkgs) callPackage; in rec
|
||||
# *and* non-JS OCaml libraries can pull in the same version of JS transitive
|
||||
# dependencies. Remove this once ligo and stanc can be compiled against
|
||||
# janestreet 0.16 libraries.
|
||||
ocamlPackages_4_14_janeStreet_0_15 = ocamlPackages_4_14.overrideScope' (self: super: super // super.janeStreet_0_15);
|
||||
ocamlPackages_4_14_janeStreet_0_15 = ocamlPackages_4_14.overrideScope (self: super: super // super.janeStreet_0_15);
|
||||
|
||||
# We still have packages that rely on unsafe-string, which is deprecated in OCaml 4.06.0.
|
||||
# Below are aliases for porting them to the latest versions of the OCaml 4 series.
|
||||
|
||||
@ -1898,6 +1898,8 @@ self: super: with self; {
|
||||
|
||||
certvalidator = callPackage ../development/python-modules/certvalidator { };
|
||||
|
||||
cf-xarray = callPackage ../development/python-modules/cf-xarray { };
|
||||
|
||||
cffi = callPackage ../development/python-modules/cffi { };
|
||||
|
||||
cffsubr = callPackage ../development/python-modules/cffsubr { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user