Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
792f4d7934
|
|
@ -1,17 +1,31 @@
|
|||
# Testers {#chap-testers}
|
||||
This chapter describes several testing builders which are available in the `testers` namespace.
|
||||
|
||||
## `hasPkgConfigModule` {#tester-hasPkgConfigModule}
|
||||
## `hasPkgConfigModules` {#tester-hasPkgConfigModules}
|
||||
|
||||
Checks whether a package exposes a certain `pkg-config` module.
|
||||
<!-- Old anchor name so links still work -->
|
||||
[]{#tester-hasPkgConfigModule}
|
||||
Checks whether a package exposes a given list of `pkg-config` modules.
|
||||
If the `moduleNames` argument is omitted, `hasPkgConfigModules` will
|
||||
use `meta.pkgConfigModules`.
|
||||
|
||||
Example:
|
||||
|
||||
```nix
|
||||
passthru.tests.pkg-config = testers.hasPkgConfigModule {
|
||||
passthru.tests.pkg-config = testers.hasPkgConfigModules {
|
||||
package = finalAttrs.finalPackage;
|
||||
moduleName = "libfoo";
|
||||
}
|
||||
moduleNames = [ "libfoo" ];
|
||||
};
|
||||
```
|
||||
|
||||
If the package in question has `meta.pkgConfigModules` set, it is even simpler:
|
||||
|
||||
```nix
|
||||
passthru.tests.pkg-config = testers.hasPkgConfigModules {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
meta.pkgConfigModules = [ "libfoo" ];
|
||||
```
|
||||
|
||||
## `testVersion` {#tester-testVersion}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ in
|
|||
'';
|
||||
};
|
||||
quickPhrase = mkOption {
|
||||
type = with types; attrsOf string;
|
||||
type = with types; attrsOf str;
|
||||
default = { };
|
||||
example = literalExpression ''
|
||||
{
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ in
|
|||
};
|
||||
|
||||
preferences = mkOption {
|
||||
type = with types; attrsOf (oneOf [ bool int string ]);
|
||||
type = with types; attrsOf (oneOf [ bool int str ]);
|
||||
default = { };
|
||||
description = mdDoc ''
|
||||
Preferences to set from `about:config`.
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ in
|
|||
};
|
||||
|
||||
args = mkOption {
|
||||
type = types.listOf types.string;
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
example = [ "--rt" "--prefer-vk-device 8086:9bc4" ];
|
||||
description = mdDoc ''
|
||||
|
|
@ -51,7 +51,7 @@ in
|
|||
};
|
||||
|
||||
env = mkOption {
|
||||
type = types.attrsOf types.string;
|
||||
type = types.attrsOf types.str;
|
||||
default = { };
|
||||
example = literalExpression ''
|
||||
# for Prime render offload on Nvidia laptops.
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ in {
|
|||
options = {
|
||||
enable = mkEnableOption (mdDoc "GameScope Session");
|
||||
args = mkOption {
|
||||
type = types.listOf types.string;
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
description = mdDoc ''
|
||||
Arguments to be passed to GameScope for the session.
|
||||
|
|
@ -97,7 +97,7 @@ in {
|
|||
};
|
||||
|
||||
env = mkOption {
|
||||
type = types.attrsOf types.string;
|
||||
type = types.attrsOf types.str;
|
||||
default = { };
|
||||
description = mdDoc ''
|
||||
Environmental variables to be passed to GameScope for the session.
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ in {
|
|||
};
|
||||
|
||||
ifpAllowedUids = mkOption {
|
||||
type = types.listOf types.string;
|
||||
type = types.listOf types.str;
|
||||
default = ["root"];
|
||||
description = lib.mdDoc "A list of users allowed to access the ifp dbus interface.";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -934,7 +934,7 @@ in
|
|||
};
|
||||
authserver = mkOption {
|
||||
default = null;
|
||||
type = with types; nullOr string;
|
||||
type = with types; nullOr str;
|
||||
description = lib.mdDoc ''
|
||||
This controls the hostname for the 9front authentication server
|
||||
that users will be authenticated against.
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ in
|
|||
};
|
||||
|
||||
otherNodesIps = mkOption {
|
||||
type = types.listOf types.string;
|
||||
type = types.listOf types.str;
|
||||
example = [ "192.168.1.2" "192.168.1.3" ];
|
||||
description = mdDoc ''
|
||||
IP addresses of the other nodes.
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ let
|
|||
keyboardOptions = { ... }: {
|
||||
options = {
|
||||
ids = mkOption {
|
||||
type = types.listOf types.string;
|
||||
type = types.listOf types.str;
|
||||
default = [ "*" ];
|
||||
example = [ "*" "-0123:0456" ];
|
||||
description = lib.mdDoc ''
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ in {
|
|||
|
||||
user = mkOption {
|
||||
default = "maddy";
|
||||
type = with types; uniq string;
|
||||
type = with types; uniq str;
|
||||
description = lib.mdDoc ''
|
||||
User account under which maddy runs.
|
||||
|
||||
|
|
@ -156,7 +156,7 @@ in {
|
|||
|
||||
group = mkOption {
|
||||
default = "maddy";
|
||||
type = with types; uniq string;
|
||||
type = with types; uniq str;
|
||||
description = lib.mdDoc ''
|
||||
Group account under which maddy runs.
|
||||
|
||||
|
|
@ -170,7 +170,7 @@ in {
|
|||
|
||||
hostname = mkOption {
|
||||
default = "localhost";
|
||||
type = with types; uniq string;
|
||||
type = with types; uniq str;
|
||||
example = ''example.com'';
|
||||
description = lib.mdDoc ''
|
||||
Hostname to use. It should be FQDN.
|
||||
|
|
@ -179,7 +179,7 @@ in {
|
|||
|
||||
primaryDomain = mkOption {
|
||||
default = "localhost";
|
||||
type = with types; uniq string;
|
||||
type = with types; uniq str;
|
||||
example = ''mail.example.com'';
|
||||
description = lib.mdDoc ''
|
||||
Primary MX domain to use. It should be FQDN.
|
||||
|
|
|
|||
|
|
@ -405,7 +405,11 @@ in {
|
|||
adminuser = mkOption {
|
||||
type = types.str;
|
||||
default = "root";
|
||||
description = lib.mdDoc "Username for the admin account.";
|
||||
description = lib.mdDoc ''
|
||||
Username for the admin account. The username is only set during the
|
||||
initial setup of Nextcloud! Since the username also acts as unique
|
||||
ID internally, it cannot be changed later!
|
||||
'';
|
||||
};
|
||||
adminpassFile = mkOption {
|
||||
type = types.str;
|
||||
|
|
|
|||
|
|
@ -377,12 +377,12 @@ final: prev:
|
|||
|
||||
SpaceVim = buildVimPluginFrom2Nix {
|
||||
pname = "SpaceVim";
|
||||
version = "2023-08-06";
|
||||
version = "2023-08-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpaceVim";
|
||||
repo = "SpaceVim";
|
||||
rev = "dcb0b64972ad555ecdfd2f82776d0565a974c132";
|
||||
sha256 = "17l1jvw24xm7si3y5smh530j7qz4xj99jssnx3iyngn6rs72g752";
|
||||
rev = "1c2832a0a70b4908cd4334593df6ec81c479e6d8";
|
||||
sha256 = "0dfmgv6zmabx1zqqz68qcgl9a2jnmiq3nxlpw5lym4jvrss8pyad";
|
||||
};
|
||||
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
|
||||
};
|
||||
|
|
@ -763,12 +763,12 @@ final: prev:
|
|||
|
||||
asynctasks-vim = buildVimPluginFrom2Nix {
|
||||
pname = "asynctasks.vim";
|
||||
version = "2023-08-05";
|
||||
version = "2023-08-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "skywind3000";
|
||||
repo = "asynctasks.vim";
|
||||
rev = "1cfbd38c141f230f395acd5df44d94d0b43e22d3";
|
||||
sha256 = "0rgp14k4rbrqqs0hjdk90zzsmxdpk25xydscdlik6aq8nz6p46yd";
|
||||
rev = "12f44e6a00f7fded4f60fe9c91fad507bf8abbb6";
|
||||
sha256 = "0jqz1n15gypklhiwnh922js87aw8c59v3kffc6p82bxak1vsm02z";
|
||||
};
|
||||
meta.homepage = "https://github.com/skywind3000/asynctasks.vim/";
|
||||
};
|
||||
|
|
@ -859,12 +859,12 @@ final: prev:
|
|||
|
||||
autoclose-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "autoclose.nvim";
|
||||
version = "2023-08-06";
|
||||
version = "2023-08-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "m4xshen";
|
||||
repo = "autoclose.nvim";
|
||||
rev = "fb1530a11d54ce52a4ce4f11f38b39dd8a69905b";
|
||||
sha256 = "1xym5gfzrav1yarav204z7qyrmjdvw51zsxxa64lz8zvap666q1y";
|
||||
rev = "d8bebaaf8c48bd0cd0645d20592548eab279fea3";
|
||||
sha256 = "0j4265rghdsswzcghs8khh0bizgnyfz88n295gxqbgflxqblh68w";
|
||||
};
|
||||
meta.homepage = "https://github.com/m4xshen/autoclose.nvim/";
|
||||
};
|
||||
|
|
@ -1231,12 +1231,12 @@ final: prev:
|
|||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2023-08-06";
|
||||
version = "2023-08-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "a39fdc1016119138ae4eee79faaccae99aef8bba";
|
||||
sha256 = "1g2k5g9cccvmpnzkjsh9rfavbvx32aw1liv75h0cngall0kx2k7v";
|
||||
rev = "62bd10d662d1845934c8173788a9f514e23ae925";
|
||||
sha256 = "0ydl4qbvcjzzylgrm3nggxa6i2gv0dvb612ad6f98lqf1njaz30p";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
|
@ -1303,12 +1303,12 @@ final: prev:
|
|||
|
||||
clangd_extensions-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "clangd_extensions.nvim";
|
||||
version = "2023-07-30";
|
||||
version = "2023-08-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "p00f";
|
||||
repo = "clangd_extensions.nvim";
|
||||
rev = "723639da63ad87753c4a9271077a39b5b2f080a4";
|
||||
sha256 = "0wd8n5qqx2ii1vcmmcknb4h6cigaqb1nkif2x7vzvvmi5igk0ma5";
|
||||
rev = "84ed5417b6119dca77c4f96da1fd73e316b85781";
|
||||
sha256 = "1z60jwzz15p13699cshdbpyjph1gx7vpgkha8d7dwm88vl3dkcfc";
|
||||
};
|
||||
meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/";
|
||||
};
|
||||
|
|
@ -2083,24 +2083,24 @@ final: prev:
|
|||
|
||||
command-t = buildVimPluginFrom2Nix {
|
||||
pname = "command-t";
|
||||
version = "2023-07-14";
|
||||
version = "2023-08-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wincent";
|
||||
repo = "command-t";
|
||||
rev = "9a1343c396178dc55ccc1166bf1eb434b5c18c43";
|
||||
sha256 = "0qwkbf9yn7lwvihp3qdgd2kc85i6i3cca7spi2pcjsnf74bykqm8";
|
||||
rev = "459e9c6e7d5bd8f559bbf8101869d0c9e800b154";
|
||||
sha256 = "1iq1g83za7prgwwakdsf5j8dzb4gb00r76nflj1i3h3yj0kn2vsi";
|
||||
};
|
||||
meta.homepage = "https://github.com/wincent/command-t/";
|
||||
};
|
||||
|
||||
comment-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "comment.nvim";
|
||||
version = "2023-08-02";
|
||||
version = "2023-08-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "numtostr";
|
||||
repo = "comment.nvim";
|
||||
rev = "d0cbbfb539898a275dc4398446ab0ae3b94819bf";
|
||||
sha256 = "0dqb5ydpdsxzhf2v1dqg1vdqyvg8iqzc7ydiybvxik29mvc4ybp9";
|
||||
rev = "0236521ea582747b58869cb72f70ccfa967d2e89";
|
||||
sha256 = "1mvi7c6n9ybgs6lfylzhkidifa6jkgsbj808knx57blvi5k7blgr";
|
||||
};
|
||||
meta.homepage = "https://github.com/numtostr/comment.nvim/";
|
||||
};
|
||||
|
|
@ -2311,12 +2311,12 @@ final: prev:
|
|||
|
||||
copilot-vim = buildVimPluginFrom2Nix {
|
||||
pname = "copilot.vim";
|
||||
version = "2023-08-03";
|
||||
version = "2023-08-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "copilot.vim";
|
||||
rev = "4a361e8cf327590d51d214c5c01c6391727390d7";
|
||||
sha256 = "137b4xfvvkqbf4hvc9a1cvsa49hlp7n65hmzla5nn0l0wv0qqjfg";
|
||||
rev = "97a9f1af97627b6aebeef864c981539ac1776b69";
|
||||
sha256 = "1rh5jznppn9fqlah5jl7wcv22m1i21pskffbqgfvmylxrgxg3h8f";
|
||||
};
|
||||
meta.homepage = "https://github.com/github/copilot.vim/";
|
||||
};
|
||||
|
|
@ -3013,8 +3013,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "sainnhe";
|
||||
repo = "edge";
|
||||
rev = "9e72b6e4e7f93ae83d0704680996c8f33ca4fae5";
|
||||
sha256 = "09dvc68bqhxbar9kni1v6b1mq607b50z4cb690j3ga4zys22mdjl";
|
||||
rev = "a4fd4f458331d42677d992f428235c491b2016aa";
|
||||
sha256 = "088s18nicji5zvx2xpwr2b1qvwq84ji5gd125lwxllq37vw6y6zv";
|
||||
};
|
||||
meta.homepage = "https://github.com/sainnhe/edge/";
|
||||
};
|
||||
|
|
@ -3147,8 +3147,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "sainnhe";
|
||||
repo = "everforest";
|
||||
rev = "d02998c0109f528f38bd30572221735e11ccff33";
|
||||
sha256 = "1mc7f0wxm1svfkil08ssd9mlg2qyg8pw28v3q892x37g4lz8f2x7";
|
||||
rev = "83b666410d7ae0eccf96dbbe3b4b6ac5b8172d38";
|
||||
sha256 = "1c0948bdqydl0r3qvx6p4vpaflfg82s1q9s3cl3c6alqzc46pdjh";
|
||||
};
|
||||
meta.homepage = "https://github.com/sainnhe/everforest/";
|
||||
};
|
||||
|
|
@ -3720,12 +3720,12 @@ final: prev:
|
|||
|
||||
gitsigns-nvim = buildNeovimPlugin {
|
||||
pname = "gitsigns.nvim";
|
||||
version = "2023-08-06";
|
||||
version = "2023-08-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "gitsigns.nvim";
|
||||
rev = "31178496552584e84fa9e74e087dec1f6c347f5d";
|
||||
sha256 = "0j7n0kcy26g7kpi2wmy8qzja2pbw6fb8w2v771g0dv1wq77fccqn";
|
||||
rev = "287fffb410ce82d19da2d503a1f1570adf7b7874";
|
||||
sha256 = "00cg45dascmbnfmb0lhvxcm82f597bmmy5sh003c0amsn0zc7k30";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
|
||||
};
|
||||
|
|
@ -3780,12 +3780,12 @@ final: prev:
|
|||
|
||||
go-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "go.nvim";
|
||||
version = "2023-07-27";
|
||||
version = "2023-08-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ray-x";
|
||||
repo = "go.nvim";
|
||||
rev = "7e5602dd51a230581f43c42559d7acc2fbca23cf";
|
||||
sha256 = "1090n4rdgjfgzfabdmmi0rxd4xk1h2y5jmhy9z7ncs0qpplhnbq2";
|
||||
rev = "44bd0589ad22e2bb91f2ed75624c4a3bab0e5f59";
|
||||
sha256 = "15s8k9hb6j63xj0q6b3ir1m76diyh4wf8p82606yd142jnin80ni";
|
||||
};
|
||||
meta.homepage = "https://github.com/ray-x/go.nvim/";
|
||||
};
|
||||
|
|
@ -3904,8 +3904,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "sainnhe";
|
||||
repo = "gruvbox-material";
|
||||
rev = "c320fac92c29ea1cce9834acad0bf1e020977417";
|
||||
sha256 = "1i2gy3mppfsgarhdi4p1bnf8i335jshb495h140a7bgldclnbfyb";
|
||||
rev = "b5f8c6a6c1cda630c53b061b765068a0898d47a3";
|
||||
sha256 = "1vb36n4kd08bfprmfjds2kg11wmwhrd1hqpg67lmhkpccgl0xdsn";
|
||||
};
|
||||
meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
|
||||
};
|
||||
|
|
@ -5122,14 +5122,14 @@ final: prev:
|
|||
|
||||
lspsaga-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lspsaga.nvim";
|
||||
version = "2022-12-06";
|
||||
version = "2023-08-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kkharji";
|
||||
owner = "nvimdev";
|
||||
repo = "lspsaga.nvim";
|
||||
rev = "5faeec9f2508d2d49a66c0ac0d191096b4e3fa81";
|
||||
sha256 = "1bw71db69na2sriv9q167z9bgkir4nwny1bdfv9z606bmng4hhzc";
|
||||
rev = "5877e957fb9bb14f4ac42a45e7bbd2923ea05915";
|
||||
sha256 = "0hh5k6gr1jk7z4v2srldf9j4mxsp3p99mb4fjz8darxm1rl0zw7j";
|
||||
};
|
||||
meta.homepage = "https://github.com/kkharji/lspsaga.nvim/";
|
||||
meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
|
||||
};
|
||||
|
||||
ltex_extra-nvim = buildVimPluginFrom2Nix {
|
||||
|
|
@ -5807,12 +5807,12 @@ final: prev:
|
|||
|
||||
neogit = buildVimPluginFrom2Nix {
|
||||
pname = "neogit";
|
||||
version = "2023-08-06";
|
||||
version = "2023-08-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NeogitOrg";
|
||||
repo = "neogit";
|
||||
rev = "23459f02dac199d9029dd1a03db3aeaff974a51a";
|
||||
sha256 = "13152k1l0ja87phr849v6zrhfmlsb9g8klqmr6rdhmc5f6fi6y05";
|
||||
rev = "09f8f64d5b28ad3dcdc173beb60efe6a78301064";
|
||||
sha256 = "0bz3gjbjlibr4qvkibg9c59gpynxmi3mrza5ild9zdfjixl1zx11";
|
||||
};
|
||||
meta.homepage = "https://github.com/NeogitOrg/neogit/";
|
||||
};
|
||||
|
|
@ -5867,12 +5867,12 @@ final: prev:
|
|||
|
||||
neorg = buildVimPluginFrom2Nix {
|
||||
pname = "neorg";
|
||||
version = "2023-08-04";
|
||||
version = "2023-08-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-neorg";
|
||||
repo = "neorg";
|
||||
rev = "0b3df8633cc1cbb3ffd6f34d4e9073fd6f5083ab";
|
||||
sha256 = "0js8fjsq3j5r90lzh8ks54q4v83kysmx9m6iyl6s3jzrv2bdbpf0";
|
||||
rev = "92f2e9d4a7bfdbb7ed0e9dcd9b8768db63188149";
|
||||
sha256 = "1li3mci8n9cqpjdcb3nm769aa7c4ydia9br3k0gbmmd5pgn98v9q";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-neorg/neorg/";
|
||||
};
|
||||
|
|
@ -6791,12 +6791,12 @@ final: prev:
|
|||
|
||||
nvim-gdb = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-gdb";
|
||||
version = "2023-08-04";
|
||||
version = "2023-08-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sakhnik";
|
||||
repo = "nvim-gdb";
|
||||
rev = "9146077e7867661a02b8f2cd15ddedd5b84e5760";
|
||||
sha256 = "0j9wkhv8fwfrfni7wsgy20xphz49a9h3q8rby5vr92qzlh2waxww";
|
||||
rev = "ca161dadc7699ca1d5fbbdc40ecf8ad54814d38f";
|
||||
sha256 = "1cv20k3cmxzbx0fbclqkkkg75hk6myhfr9n2mg1vcnrrkmvmh6vv";
|
||||
};
|
||||
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
|
||||
};
|
||||
|
|
@ -7295,12 +7295,12 @@ final: prev:
|
|||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2023-08-07";
|
||||
version = "2023-08-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "2051c8603d572c5a0b23225549fd7d735adf115f";
|
||||
sha256 = "1mkgc69rgvhwnbbd2hihksrxwfjp4vcn0yglcz4v5xqaa96pf71c";
|
||||
rev = "a9ce9fb7cccf59e0c2f65d26a14942356c93948e";
|
||||
sha256 = "0agl2wl6x378dfa4am36vcd2gdrflb98fssaywicdzlghw9yba4k";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
|
|
@ -7571,12 +7571,12 @@ final: prev:
|
|||
|
||||
onedark-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "onedark.nvim";
|
||||
version = "2023-07-13";
|
||||
version = "2023-08-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "navarasu";
|
||||
repo = "onedark.nvim";
|
||||
rev = "cae5fdf035ee92c407a29ee2ccfcff503d2be7f1";
|
||||
sha256 = "0vnsihlwq930hm8f8j6h4ixbk4rrrmqjlkw9q5nd3x38k899iz0x";
|
||||
rev = "09b71d84bd2524438e48c0aa5b54d855cc72af32";
|
||||
sha256 = "1crlzkgdpxsvcvc1djc9ai3abm1szkrwrsknzxa7zdx4w1jlvpvs";
|
||||
};
|
||||
meta.homepage = "https://github.com/navarasu/onedark.nvim/";
|
||||
};
|
||||
|
|
@ -8671,8 +8671,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "sainnhe";
|
||||
repo = "sonokai";
|
||||
rev = "066dfa7f8d9f9f9916f3c277e08d145ac3717c2b";
|
||||
sha256 = "179yqw9da9jm3v3f3mk67ll1170992qj8idw0bkc2jk3n01134xi";
|
||||
rev = "17308ee6d9c764bfc1e0fa97213e7a99701b4144";
|
||||
sha256 = "1zqdzc31xjmimnmc264zafshxip55kd1cypjbll1pz7h2yc1xr3r";
|
||||
};
|
||||
meta.homepage = "https://github.com/sainnhe/sonokai/";
|
||||
};
|
||||
|
|
@ -9286,8 +9286,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope-frecency.nvim";
|
||||
rev = "c87b76f6ef1ad13ed992080c6482f6cead5457d7";
|
||||
sha256 = "1rnwqs7qlpfx6kqjn9j54ns85x4mx93fvj4l4nzlkqqw9ak3z670";
|
||||
rev = "54de6e45b958e37a2eca4dca22572b6c08866177";
|
||||
sha256 = "0kp6j2w1sfk28h7kxa9bhmqpav13r5qsmrdngcsdxpj5ffzpbyls";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
|
||||
};
|
||||
|
|
@ -9512,12 +9512,12 @@ final: prev:
|
|||
|
||||
telescope-nvim = buildNeovimPlugin {
|
||||
pname = "telescope.nvim";
|
||||
version = "2023-08-06";
|
||||
version = "2023-08-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "5a3fb8a012f9fcf777ba8deeae1c759362413efa";
|
||||
sha256 = "09xw5xknydljwj7gs3j5cayjybay1pm09s6lbkyfj0jdv11w3ypz";
|
||||
rev = "dc192faceb2db64231ead71539761e055df66d73";
|
||||
sha256 = "08d4k4z0ixz3y0kwpixry7zzbrb03zb570d13zdp5d0if7p9h68a";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
};
|
||||
|
|
@ -9981,12 +9981,12 @@ final: prev:
|
|||
|
||||
unison = buildVimPluginFrom2Nix {
|
||||
pname = "unison";
|
||||
version = "2023-08-02";
|
||||
version = "2023-08-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "unisonweb";
|
||||
repo = "unison";
|
||||
rev = "39c3bd558f72605ab42f6e8be8067a5f988dc082";
|
||||
sha256 = "15g5v0093aqgnfdvq1kvfdy5rgrmxhmdqpfz5a23r8jpqyni8ik1";
|
||||
rev = "5e428a7701005710ac05e9bf30d1547edd8f25e9";
|
||||
sha256 = "1sjx8bvl09i9fycxw5wad6gc95wg8l262npkxs1a1qfx46nrj551";
|
||||
};
|
||||
meta.homepage = "https://github.com/unisonweb/unison/";
|
||||
};
|
||||
|
|
@ -15613,18 +15613,6 @@ final: prev:
|
|||
meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
|
||||
};
|
||||
|
||||
lspsaga-nvim-original = buildVimPluginFrom2Nix {
|
||||
pname = "lspsaga-nvim-original";
|
||||
version = "2023-08-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvimdev";
|
||||
repo = "lspsaga.nvim";
|
||||
rev = "2fea9e5828133692d189b159987d2dbcfa9d98f2";
|
||||
sha256 = "04fjbnws20nmngqhqr85dzwpiqlfmn9jwj1i8igaj28fyixkajxg";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
|
||||
};
|
||||
|
||||
mattn-calendar-vim = buildVimPluginFrom2Nix {
|
||||
pname = "mattn-calendar-vim";
|
||||
version = "2022-02-10";
|
||||
|
|
|
|||
|
|
@ -1796,12 +1796,12 @@
|
|||
};
|
||||
sql = buildGrammar {
|
||||
language = "sql";
|
||||
version = "0.0.0+rev=012fe71";
|
||||
version = "0.0.0+rev=a000dd8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "derekstride";
|
||||
repo = "tree-sitter-sql";
|
||||
rev = "012fe71ce44399e870f75615b54bd40d91b87a63";
|
||||
hash = "sha256-K977zxbsxRkSlA+pYW5oVV3kECDHgUhDrnY3kHdBMP0=";
|
||||
rev = "a000dd8930464c71fa6fec9be4fdd6198068393c";
|
||||
hash = "sha256-37nN/Zh84iTmmpZ804rnb/7oXzQqOk7ub1FbkCMlT28=";
|
||||
};
|
||||
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
||||
};
|
||||
|
|
@ -2176,12 +2176,12 @@
|
|||
};
|
||||
wing = buildGrammar {
|
||||
language = "wing";
|
||||
version = "0.0.0+rev=fea885a";
|
||||
version = "0.0.0+rev=df94899";
|
||||
src = fetchFromGitHub {
|
||||
owner = "winglang";
|
||||
repo = "wing";
|
||||
rev = "fea885a0358e5d6146dbd12feaa3f270ddfd78a3";
|
||||
hash = "sha256-4sLupliDl7j281sMcVeF4EROI9TvAqhh077ZhJI6Ctw=";
|
||||
rev = "df94899fcee25e2da32744760aa4394d2e728a33";
|
||||
hash = "sha256-4mp3m029/3Kvke8NXbLQmE3qZa+c9I6x6nht1AckSgA=";
|
||||
};
|
||||
location = "libs/tree-sitter-wing";
|
||||
generate = true;
|
||||
|
|
|
|||
|
|
@ -428,8 +428,7 @@ https://git.sr.ht/~whynothugo/lsp_lines.nvim,,
|
|||
https://github.com/ray-x/lsp_signature.nvim/,,
|
||||
https://github.com/lspcontainers/lspcontainers.nvim/,,
|
||||
https://github.com/onsails/lspkind-nvim/,,
|
||||
https://github.com/tami5/lspsaga.nvim/,,
|
||||
https://github.com/glepnir/lspsaga.nvim/,main,lspsaga-nvim-original
|
||||
https://github.com/nvimdev/lspsaga.nvim/,,
|
||||
https://github.com/barreiroleo/ltex_extra.nvim/,HEAD,
|
||||
https://github.com/arkav/lualine-lsp-progress/,,
|
||||
https://github.com/nvim-lualine/lualine.nvim/,,
|
||||
|
|
|
|||
|
|
@ -15,11 +15,7 @@
|
|||
, executableName, longName, shortName, pname, updateScript
|
||||
, dontFixup ? false
|
||||
, rev ? null, vscodeServer ? null
|
||||
|
||||
# sourceExecutableName is the name of the binary in the source archive, over
|
||||
# which we have no control
|
||||
, sourceExecutableName ? executableName
|
||||
|
||||
, useVSCodeRipgrep ? false
|
||||
, ripgrep
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -5,6 +5,12 @@
|
|||
, nixosTests
|
||||
, srcOnly
|
||||
, isInsiders ? false
|
||||
# sourceExecutableName is the name of the binary in the source archive over
|
||||
# which we have no control and it is needed to run the insider version as
|
||||
# documented in https://nixos.wiki/wiki/Visual_Studio_Code#Insiders_Build
|
||||
# On MacOS the insider binary is still called code instead of code-insiders as
|
||||
# of 2023-08-06.
|
||||
, sourceExecutableName ? "code" + lib.optionalString (isInsiders && stdenv.isLinux) "-insiders"
|
||||
, commandLineArgs ? ""
|
||||
, useVSCodeRipgrep ? stdenv.isDarwin
|
||||
}:
|
||||
|
|
@ -35,7 +41,7 @@ in
|
|||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.81.0";
|
||||
pname = "vscode";
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "6445d93c81ebe42c4cbd7a60712e0b17d9463e97";
|
||||
|
|
@ -43,7 +49,7 @@ in
|
|||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
||||
shortName = "Code" + lib.optionalString isInsiders " - Insiders";
|
||||
inherit commandLineArgs useVSCodeRipgrep;
|
||||
inherit commandLineArgs useVSCodeRipgrep sourceExecutableName;
|
||||
|
||||
src = fetchurl {
|
||||
name = "VSCode_${version}_${plat}.${archive_fmt}";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "geoipupdate";
|
||||
version = "5.1.1";
|
||||
version = "6.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxmind";
|
||||
repo = "geoipupdate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-n32HxXNk/mHYL6Dn3c8jmTIwrwOfyyd/dui1Uw/xf90=";
|
||||
sha256 = "sha256-Rm/W3Q5mb+qkrUYqWK83fi1FgO4KoL7+MjTuvhvY/qk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-t6uhFvuR54Q4nYur/3oBzAbBTaIjzHfx7GeEk6X/0os=";
|
||||
vendorHash = "sha256-YXybBVGCbdsP2pP7neHWI7KhkpE3tRo9Wpsx1RaEn9w=";
|
||||
|
||||
ldflags = [ "-X main.version=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "system76-keyboard-configurator";
|
||||
version = "1.3.8";
|
||||
version = "1.3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "keyboard-configurator";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fjuX/fOQMdJvqpZCfyUkYS/NRPFymAvMrD3/+ntwXGc=";
|
||||
sha256 = "sha256-06qiJ3NZZSvDBH7r6K1qnz0q4ngB45wBoaG6eTFiRtk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
|||
udev
|
||||
];
|
||||
|
||||
cargoHash = "sha256-Cav2W8iUq1GYUOnXb/ECwwKQ8uzQRW/7r5EzV7IS2Nc=";
|
||||
cargoHash = "sha256-tcyLoXOrC+lrFVRzxWfWpvHpfA6tbEBXFj9mSeTLcbc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Keyboard configuration application for System76 keyboards and laptops";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubelogin";
|
||||
version = "0.0.29";
|
||||
version = "0.0.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-B6p+quzFPx2KHVqUvJly2x+F9pHBWaUxuSdhG36V/5U=";
|
||||
sha256 = "sha256-yIRiIZKq+Q10Uo/9qEToeMHMipA5rApkxIRr/IJ0yfY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-H8hfphAcz/Lc1JLxejodV4YQ9IPyPgVeDXdPT9AYpmk=";
|
||||
vendorHash = "sha256-XHSVLATWKklg1jWL4Lnaey7hCkYHAk/cNyUgQZ6WIq0=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${version}"
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "talosctl";
|
||||
version = "1.4.6";
|
||||
version = "1.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "talos";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jC502ju44seg2khHszshRIE66f7cfYTKqssNIFkDxrs=";
|
||||
hash = "sha256-K5YuT8OTxkkv5k6bW6kFDB3NMmXM1yFGBxId0snShe4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XTN8JKssj3a88B+CNF6a4rqsf+tRYkQxFbyHco9r6Y8=";
|
||||
vendorHash = "sha256-RJhsGjpSHbRXhOr2OkjY7x/Tgw+o7eJ9Ebd+NpW5KFs=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -102,9 +102,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
command = "pjsua --version";
|
||||
};
|
||||
|
||||
passthru.tests.pkg-config = testers.hasPkgConfigModule {
|
||||
passthru.tests.pkg-config = testers.hasPkgConfigModules {
|
||||
package = finalAttrs.finalPackage;
|
||||
moduleName = "libpjproject";
|
||||
};
|
||||
|
||||
passthru.tests.python-pjsua2 = runCommand "python-pjsua2" { } ''
|
||||
|
|
@ -118,5 +117,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
maintainers = with maintainers; [ olynch ];
|
||||
mainProgram = "pjsua";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
pkgConfigModules = [
|
||||
"libpjproject"
|
||||
];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
28
pkgs/applications/networking/sync/storj-uplink/default.nix
Normal file
28
pkgs/applications/networking/sync/storj-uplink/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "storj-uplink";
|
||||
version = "1.85.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storj";
|
||||
repo = "storj";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WfV7n4AgZoD8rOd6UVBFRqOz9qs1frjSGLUhjxqTG08=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/uplink" ];
|
||||
|
||||
vendorHash = "sha256-EkB8GjWtOO3Yi0PFFE8G8swwzYmw6D6LDO24vnSrkLs=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line tool for Storj";
|
||||
homepage = "https://storj.io";
|
||||
license = licenses.agpl3Only;
|
||||
mainProgram = "uplink";
|
||||
maintainers = with maintainers; [ felipeqq2 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, buildNpmPackage
|
||||
, nixosTests
|
||||
|
|
@ -14,6 +15,7 @@
|
|||
, unpaper
|
||||
, poppler_utils
|
||||
, liberation_ttf
|
||||
, xcbuild
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -53,6 +55,8 @@ let
|
|||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
xcbuild
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -279,6 +283,8 @@ python.pkgs.buildPythonApplication rec {
|
|||
"testNormalOperation"
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
passthru = {
|
||||
inherit python path frontend;
|
||||
tests = { inherit (nixosTests) paperless; };
|
||||
|
|
@ -289,7 +295,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
homepage = "https://docs.paperless-ngx.com/";
|
||||
changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ lukegb gador erikarvstedt leona ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
24
pkgs/applications/science/electronics/linux-gpib/common.nix
Normal file
24
pkgs/applications/science/electronics/linux-gpib/common.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ pname, fetchurl, lib }: rec {
|
||||
version = "4.3.6";
|
||||
inherit pname;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/linux-gpib/linux-gpib%20for%203.x.x%20and%202.6.x%20kernels/${version}/linux-gpib-${version}.tar.gz";
|
||||
hash = "sha256-Gze4xrvkhEgn+J5Jhrycezjp2uhlD1v6aX0WGv4J2Jg=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
tar xf $src
|
||||
tar xf linux-gpib-${version}/${pname}-${version}.tar.gz
|
||||
'';
|
||||
|
||||
sourceRoot = "${pname}-${version}";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Support package for GPIB (IEEE 488) hardware";
|
||||
homepage = "https://linux-gpib.sourceforge.io/";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ fsagbuya ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
23
pkgs/applications/science/electronics/linux-gpib/kernel.nix
Normal file
23
pkgs/applications/science/electronics/linux-gpib/kernel.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, kernel
|
||||
, pahole
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (import ./common.nix { inherit fetchurl lib; pname = "linux-gpib-kernel"; } // {
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's@/sbin/depmod -A@@g' Makefile
|
||||
'';
|
||||
|
||||
buildInputs = [ pahole ] ++ kernel.moduleBuildDependencies;
|
||||
|
||||
makeFlags = [
|
||||
"LINUX_SRCDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
];
|
||||
|
||||
installFlags = [
|
||||
"INSTALL_MOD_PATH=$(out)"
|
||||
];
|
||||
})
|
||||
25
pkgs/applications/science/electronics/linux-gpib/user.nix
Normal file
25
pkgs/applications/science/electronics/linux-gpib/user.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, autoconf
|
||||
, libtool
|
||||
, bison
|
||||
, flex
|
||||
, automake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (import ./common.nix { inherit fetchurl lib; pname = "linux-gpib-user"; } // {
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
libtool
|
||||
bison
|
||||
flex
|
||||
automake
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--sysconfdir=$(out)/etc"
|
||||
"--prefix=$(out)"
|
||||
];
|
||||
})
|
||||
40
pkgs/applications/science/misc/reason-shell/default.nix
Normal file
40
pkgs/applications/science/misc/reason-shell/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, openssl
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "reason";
|
||||
version = "0.3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jaywonchung";
|
||||
repo = "reason";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oytRquZJgb1sfpZil1bSGwIIvm+5N4mkVmIMzWyzDco=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4AEuFSM2dY6UjjIFRU8ipkRMoEb2LjnOr3H6rZrLokE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A shell for research papers";
|
||||
homepage = "https://github.com/jaywonchung/reason";
|
||||
changelog = "https://github.com/jaywonchung/reason/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
runHook preInstallCheck
|
||||
|
||||
echo -e "#include<stdio.h>\nint main() {printf(\"Hello, world\");return 0;}" > hello.c
|
||||
${riscvPkgs.stdenv.cc}/bin/riscv64-none-elf-gcc -o hello hello.c
|
||||
${riscvPkgs.stdenv.cc}/bin/${riscvPkgs.stdenv.cc.targetPrefix}cc -o hello hello.c
|
||||
$out/bin/spike -m64 ${riscvPkgs.riscv-pk}/bin/pk hello | grep -Fq "Hello, world"
|
||||
|
||||
runHook postInstallCheck
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, buildPackages, lib, callPackage, runCommand, stdenv, substituteAll, }:
|
||||
{ pkgs, buildPackages, lib, callPackage, runCommand, stdenv, substituteAll, testers }:
|
||||
# Documentation is in doc/builders/testers.chapter.md
|
||||
{
|
||||
# See https://nixos.org/manual/nixpkgs/unstable/#tester-testBuildFailure
|
||||
|
|
@ -137,7 +137,14 @@
|
|||
in
|
||||
nixosTesting.simpleTest calledTest;
|
||||
|
||||
hasPkgConfigModule = callPackage ./hasPkgConfigModule/tester.nix { };
|
||||
hasPkgConfigModule =
|
||||
{ moduleName, ... }@args:
|
||||
lib.warn "testers.hasPkgConfigModule has been deprecated in favor of testers.hasPkgConfigModules. It accepts a list of strings via the moduleNames argument instead of a single moduleName." (
|
||||
testers.hasPkgConfigModules (builtins.removeAttrs args [ "moduleName" ] // {
|
||||
moduleNames = [ moduleName ];
|
||||
})
|
||||
);
|
||||
hasPkgConfigModules = callPackage ./hasPkgConfigModules/tester.nix { };
|
||||
|
||||
testMetaPkgConfig = callPackage ./testMetaPkgConfig/tester.nix { };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
# Static arguments
|
||||
{ runCommand, pkg-config }:
|
||||
{ lib, runCommand, pkg-config }:
|
||||
|
||||
# Tester arguments
|
||||
{ package,
|
||||
moduleName,
|
||||
testName ? "check-pkg-config-${moduleName}",
|
||||
moduleNames ? package.meta.pkgConfigModules,
|
||||
testName ? "check-pkg-config-${lib.concatStringsSep "-" moduleNames}",
|
||||
}:
|
||||
|
||||
runCommand testName {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ package ];
|
||||
inherit moduleName;
|
||||
inherit moduleNames;
|
||||
meta = {
|
||||
description = "Test whether ${package.name} exposes pkg-config module ${moduleName}";
|
||||
description = "Test whether ${package.name} exposes pkg-config modules ${lib.concatStringsSep ", " moduleNames}.";
|
||||
}
|
||||
# Make sure licensing info etc is preserved, as this is a concern for e.g. cache.nixos.org,
|
||||
# as hydra can't check this meta info in dependencies.
|
||||
|
|
@ -30,18 +30,20 @@ runCommand testName {
|
|||
}
|
||||
package.meta;
|
||||
} ''
|
||||
echo "checking pkg-config module $moduleName in $buildInputs"
|
||||
set +e
|
||||
version="$(pkg-config --modversion $moduleName)"
|
||||
r=$?
|
||||
set -e
|
||||
if [[ $r = 0 ]]; then
|
||||
echo "✅ pkg-config module $moduleName exists and has version $version"
|
||||
echo "$version" > $out
|
||||
else
|
||||
echo "These modules were available in the input propagation closure:"
|
||||
pkg-config --list-all
|
||||
echo "❌ pkg-config module $moduleName was not found"
|
||||
false
|
||||
fi
|
||||
for moduleName in $moduleNames; do
|
||||
echo "checking pkg-config module $moduleName in $buildInputs"
|
||||
set +e
|
||||
version="$(pkg-config --modversion $moduleName)"
|
||||
r=$?
|
||||
set -e
|
||||
if [[ $r = 0 ]]; then
|
||||
echo "✅ pkg-config module $moduleName exists and has version $version"
|
||||
printf '%s\t%s\n' "$moduleName" "$version" >> "$out"
|
||||
else
|
||||
echo "These modules were available in the input propagation closure:"
|
||||
pkg-config --list-all
|
||||
echo "❌ pkg-config module $moduleName was not found"
|
||||
false
|
||||
fi
|
||||
done
|
||||
''
|
||||
|
|
@ -1,19 +1,32 @@
|
|||
# cd nixpkgs
|
||||
# nix-build -A tests.testers.hasPkgConfigModule
|
||||
{ lib, testers, zlib, runCommand }:
|
||||
{ lib, testers, zlib, openssl, runCommand }:
|
||||
|
||||
lib.recurseIntoAttrs {
|
||||
|
||||
zlib-has-zlib = testers.hasPkgConfigModule {
|
||||
zlib-has-zlib = testers.hasPkgConfigModules {
|
||||
package = zlib;
|
||||
moduleName = "zlib";
|
||||
moduleNames = [ "zlib" ];
|
||||
};
|
||||
|
||||
zlib-has-meta-pkgConfigModules = testers.hasPkgConfigModules {
|
||||
package = zlib;
|
||||
};
|
||||
|
||||
openssl-has-openssl = testers.hasPkgConfigModules {
|
||||
package = openssl;
|
||||
moduleNames = [ "openssl" ];
|
||||
};
|
||||
|
||||
openssl-has-all-meta-pkgConfigModules = testers.hasPkgConfigModules {
|
||||
package = openssl;
|
||||
};
|
||||
|
||||
zlib-does-not-have-ylib = runCommand "zlib-does-not-have-ylib" {
|
||||
failed = testers.testBuildFailure (
|
||||
testers.hasPkgConfigModule {
|
||||
testers.hasPkgConfigModules {
|
||||
package = zlib;
|
||||
moduleName = "ylib";
|
||||
moduleNames = [ "ylib" ];
|
||||
}
|
||||
);
|
||||
} ''
|
||||
|
|
@ -12,7 +12,7 @@ let
|
|||
|
||||
in
|
||||
lib.recurseIntoAttrs {
|
||||
hasPkgConfigModule = pkgs.callPackage ../hasPkgConfigModule/tests.nix { };
|
||||
hasPkgConfigModules = pkgs.callPackage ../hasPkgConfigModules/tests.nix { };
|
||||
|
||||
runNixOSTest-example = pkgs-with-overlay.testers.runNixOSTest ({ lib, ... }: {
|
||||
name = "runNixOSTest-test";
|
||||
|
|
|
|||
|
|
@ -573,6 +573,6 @@ in with passthru; stdenv.mkDerivation {
|
|||
license = licenses.psfl;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ fridh ];
|
||||
mainProgram = "python3";
|
||||
mainProgram = executable;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,5 +42,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
pkgConfigModules = [ "datrie-0.2" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,5 +72,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ goibhniu ];
|
||||
platforms = platforms.unix;
|
||||
pkgConfigModules = [ "epoxy" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, lib, stdenv, substituteAll
|
||||
{ lib, stdenv, fetchurl, fetchpatch, substituteAll
|
||||
, libtool, gettext, zlib, bzip2, flac, libvorbis
|
||||
, exiv2, libgsf, rpm, pkg-config
|
||||
, gstreamerSupport ? true, gst_all_1
|
||||
|
|
@ -25,7 +25,13 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-FvYzq4dGo4VHxKHaP0WRGSsIJa2DxDNvBXW4WEPYvY8=";
|
||||
};
|
||||
|
||||
patches = lib.optionals gstreamerSupport [
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "libextractor-exiv2-0.28.patch";
|
||||
url = "https://git.pld-linux.org/?p=packages/libextractor.git;a=blob_plain;f=libextractor-exiv2-0.28.patch;h=d763b65f2578f1127713de8dc82f432d34f95a85;hb=0e7de1c6794e8c331a1a1a6a829993c7cd217d3a";
|
||||
hash = "sha256-szAv2A+NmiQyj2+R7BO6fHX588vlTgljPtrnMR6mgGY=";
|
||||
})
|
||||
] ++ lib.optionals gstreamerSupport [
|
||||
|
||||
# Libraries cannot be wrapped so we need to hardcode the plug-in paths.
|
||||
(substituteAll {
|
||||
|
|
|
|||
|
|
@ -92,5 +92,6 @@ in stdenv.mkDerivation rec {
|
|||
maintainers = [ maintainers.c0bw3b ];
|
||||
mainProgram = "psl";
|
||||
platforms = platforms.unix;
|
||||
pkgConfigModules = [ "libpsl" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,5 +99,9 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://wiki.gnome.org/Projects/libsoup";
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
inherit (glib.meta) maintainers platforms;
|
||||
pkgConfigModules = [
|
||||
"libsoup-2.4"
|
||||
"libsoup-gnome-2.4"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,5 +63,10 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ primeos ttuegel ];
|
||||
mainProgram = "xkbcli";
|
||||
platforms = with platforms; unix;
|
||||
pkgConfigModules = [
|
||||
"xkbcommon"
|
||||
"xkbcommon-x11"
|
||||
"xkbregistry"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -101,5 +101,6 @@ stdenv.mkDerivation rec {
|
|||
mainProgram = "sqlite3";
|
||||
maintainers = with maintainers; [ eelco np ];
|
||||
platforms = platforms.unix ++ platforms.windows;
|
||||
pkgConfigModules = [ "sqlite3" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,9 @@
|
|||
, linear_operator
|
||||
, multipledispatch
|
||||
, pyro-ppl
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, wheel
|
||||
, torch
|
||||
, scipy
|
||||
, pytestCheckHook
|
||||
|
|
@ -23,9 +25,12 @@ buildPythonPackage rec {
|
|||
hash = "sha256-VcNHgfk8OfLJseQxHksycWuCPCudCtOdcRV0XnxHSfU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gpytorch
|
||||
linear_operator
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bugsnag";
|
||||
version = "4.4.0";
|
||||
version = "4.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1vtoDmyulfH3YDdMoT9qBFaRd48nnTBCt0iWuQtk3iw=";
|
||||
hash = "sha256-R/Fg1OMyR8z0tDUDwqu1Sh3sbvq33AXgBScr3WNm/QY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "coinmetrics-api-client";
|
||||
version = "2023.6.8.20";
|
||||
version = "2023.7.11.17";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "coinmetrics_api_client";
|
||||
hash = "sha256-Koll0pod0vSW/F3veGTn8JYOMQI61REUW6Eh+TDJKNI=";
|
||||
hash = "sha256-s5hg9qaa5j/l/qy5DS6f1w5LH2URVyG1Uf02BSIplbc=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-auth-ldap";
|
||||
version = "4.3.0";
|
||||
version = "4.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-eItbHucAVGgdf659CF3qp28vpvZMyf49152u9iwvYSE=";
|
||||
hash = "sha256-eXkxrF1VxMoUwXnViSQgzCqYqoHkQyPVlfVBnBtFwwY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,49 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
|
||||
# build-system
|
||||
, hatchling
|
||||
|
||||
# dependencies
|
||||
, beautifulsoup4
|
||||
, pillow
|
||||
, django
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-bootstrap5";
|
||||
version = "23.3";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zostera";
|
||||
repo = "django-bootstrap5";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FIwDyZ5I/FSaEiQKRfanzAGij86u8y85Wal0B4TrI7c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
beautifulsoup4
|
||||
pillow
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"django_bootstrap5"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bootstrap 5 integration with Django";
|
||||
homepage = "https://github.com/zostera/django-bootstrap5";
|
||||
changelog = "https://github.com/zostera/django-bootstrap5/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ netali ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dkimpy";
|
||||
version = "1.1.4";
|
||||
version = "1.1.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7bbng4OzpUx3K8n/eG5+7X12pXupRiCdmVG0P1BzqwI=";
|
||||
hash = "sha256-mmZ/hmS3Lrn4qhJQsHV8w5gqto9wxIrzkxe1jPYvLXU=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytest ];
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fake-useragent";
|
||||
version = "1.1.3";
|
||||
version = "1.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "fake-useragent";
|
||||
repo = "fake-useragent";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-8fVNko65nP/u9vLGBPfSseKW07b4JC6kCPFCPK2f6wU=";
|
||||
hash = "sha256-kOvVqdfK9swtjW8D7COrZksLCu1N8sQO8rzx5RZqCT0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "globus-sdk";
|
||||
version = "3.23.0";
|
||||
version = "3.25.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "globus";
|
||||
repo = "globus-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5Y5lRNsxOrsByZ7zUu+3O5UCzjvOjKvlZLDeK5EMcHY=";
|
||||
hash = "sha256-k+gmkngZEO2vr/QP6LeJkzYG98X8Ck1EGc99F2rPeps=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "holoviews";
|
||||
version = "1.16.2";
|
||||
version = "1.17.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-RcVorlekOvc4k6CT5vrelrdxPLsP5v/0ZCamthMSJ0Y=";
|
||||
hash = "sha256-SucfkjVXFluIbN4qzE1NSyItPY2zs0zydyIQ/kVsdFI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,17 +1,33 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, typing-extensions }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, typing-extensions
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "injector";
|
||||
version = "0.20.1";
|
||||
version = "0.21.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hmG0mi+DCc5h46aoK3rLXiJcS96OF9FhDIk6Zw3/Ijo=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-injector";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5O4vJSXfYNTrUzmv5XuT9pSUndNSvTZTxfVwiAd+0ck=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ typing-extensions ];
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
];
|
||||
|
||||
doCheck = false; # No tests are available
|
||||
pythonImportsCheck = [ "injector" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mmh3";
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-BWuD0E5ZVUfQQHzI5apdi6iAKor6QXtkwcMCNbU4njA=";
|
||||
hash = "sha256-rYvmldxORKeWMXSLpVYtgD8KxC02prl6U6yoSnCAk4U=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "oci";
|
||||
version = "2.107.0";
|
||||
version = "2.109.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "oracle";
|
||||
repo = "oci-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-GeZCA5Bg3qSL3VRWh3Dvh9+4+3RgwuRVXR8LM/eKed4=";
|
||||
hash = "sha256-vG3ICLvLGu6Lu3Sxd7zmzSy2IhPTu9S0GnR5NxlAklQ=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "okonomiyaki";
|
||||
version = "1.3.2";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "enthought";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-eWCOuGtdjBGThAyu15aerclkSWC593VGDPHJ98l30iY=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-MEll1H7l41m8uz2/WK/Ilm7Dubg0uqYwe+ZgakO1aXQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ distro attrs jsonschema six zipfile2 ];
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "packageurl-python";
|
||||
version = "0.11.1";
|
||||
version = "0.11.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-u8xT0stZIMgVwWJsdZkvMZv8RQtziT+nvYqsWGmqSf4=";
|
||||
hash = "sha256-Afv3SkHvhc9BPx7eUpoUEfZYvaZu0i1F0nKArZzrpHE=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "py-partiql-parser";
|
||||
version = "0.3.5";
|
||||
version = "0.3.6";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getmoto";
|
||||
repo = "py-partiql-parser";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-CVpXw5yAYBeRgTlNzgourQlDqfNmKLdzV7mQSd7PoJg=";
|
||||
hash = "sha256-wfVADL87ObJbuYQ2MYcRH0DCOGymS6+mrp7pAIKoS4Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyprecice";
|
||||
version = "2.5.0.2";
|
||||
version = "2.5.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "precice";
|
||||
repo = "python-bindings";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ppDilMwRxVsikTFQMNRYL0G1/HvVomz2S/2yx43u000=";
|
||||
hash = "sha256-SIuv3VUpEit1ed+4AEPx59bGTDfoQYcAgO1PnVb+9VM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvmomi";
|
||||
version = "8.0.1.0.1";
|
||||
version = "8.0.1.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "vmware";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MT0jT4wT8+4OEsIDWZbiqWK+3YASfVtOQT2KkadfwbM=";
|
||||
hash = "sha256-NI2xkHo9A9zEvdbTt9vF91gavSnCuFjdjr6PxEvkSZM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyworld";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-o6gXVZg9+iKZqeKUd1JYLdzISlwnewT0WVzkQGNy0eU=";
|
||||
hash = "sha256-EGxw7np9jJukiNgCLyAzcGkppA8CZCVrjofaWquYMDo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "spacy-lookups-data";
|
||||
version = "1.0.3";
|
||||
version = "1.0.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "spacy_lookups_data";
|
||||
inherit version;
|
||||
hash = "sha256-q2hlVI+4ZtR5CQ4xEIp+Je0ZKhH8sJiW5xFjKM3FK+E=";
|
||||
hash = "sha256-b5NcgfFFvcyE/GEV9kh2QoXH/z6P8kYpUEaBTpba1jw=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trytond";
|
||||
version = "6.8.2";
|
||||
version = "6.8.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-iz5XGEhIDnrIjnm0rBpUiGfgv4PWUCSQb+noPQqUsjc=";
|
||||
hash = "sha256-n0Fdu2IjdyAt9qJ40l9kVRbV8NMXU1R5aR+9rmXEgC8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "vowpalwabbit";
|
||||
version = "9.8.0";
|
||||
version = "9.9.0";
|
||||
|
||||
src = fetchPypi{
|
||||
inherit pname version;
|
||||
hash = "sha256-s2q9K2tuILQATSjUKXe/hYdQW84bSIHwh/gfWM0/NTM=";
|
||||
hash = "sha256-YCg2EI4rhEMwcVEzx9ES8Z3CoCddeUFVk4lZ0nuQJUc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "yfinance";
|
||||
version = "0.2.24";
|
||||
version = "0.2.27";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "ranaroussi";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-V8yPB01HR+DGrKRXnmERFeC0WZal0nG3lMNVKTa519k=";
|
||||
hash = "sha256-hsSu2EnkCb/IUoLsW0HZHI4wtOUSdjRU8MmHGRuiY+g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
# Qt
|
||||
, qtbase, qtsvg, qtwebengine, qttools
|
||||
# buildInputs
|
||||
, graphviz
|
||||
, rizin
|
||||
, python3
|
||||
, wrapQtAppsHook
|
||||
|
|
@ -11,24 +12,25 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "cutter";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rizinorg";
|
||||
repo = "cutter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rzMLPkL382webds7cnfanHy9BsV+8ARkl6aES5ckmO4=";
|
||||
hash = "sha256-oQ3sLIGKMEw3k27aSFcrJqo0TgGkkBNdzl6GSoOIYak=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake qmake pkg-config python3 wrapQtAppsHook ];
|
||||
propagatedBuildInputs = [ python3.pkgs.pyside2 ];
|
||||
buildInputs = [ qtbase qttools qtsvg qtwebengine rizin python3 ];
|
||||
buildInputs = [ graphviz qtbase qttools qtsvg qtwebengine rizin python3 ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCUTTER_USE_BUNDLED_RIZIN=OFF"
|
||||
"-DCUTTER_ENABLE_PYTHON=ON"
|
||||
"-DCUTTER_ENABLE_PYTHON_BINDINGS=ON"
|
||||
"-DCUTTER_ENABLE_GRAPHVIZ=ON"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -8,11 +8,12 @@
|
|||
, perl
|
||||
, zlib
|
||||
, openssl
|
||||
, libuv
|
||||
, file
|
||||
, libmspack
|
||||
, libzip
|
||||
, lz4
|
||||
, xxHash
|
||||
, xz
|
||||
, meson
|
||||
, python3
|
||||
, cmake
|
||||
|
|
@ -23,11 +24,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rizin";
|
||||
version = "0.5.2";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz";
|
||||
hash = "sha256-cauA/DyKycgKEAANg4EoryigXTGg7hg5AMLFxuNQ7KM=";
|
||||
hash = "sha256-apJJBu/fVHrFBGJ2f1rdU5AkNuekhi0sDiTKkbd2FQg=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
|
@ -35,9 +36,11 @@ stdenv.mkDerivation rec {
|
|||
"-Duse_sys_magic=enabled"
|
||||
"-Duse_sys_libzip=enabled"
|
||||
"-Duse_sys_zlib=enabled"
|
||||
"-Duse_sys_xxhash=enabled"
|
||||
"-Duse_sys_lz4=enabled"
|
||||
"-Duse_sys_lzma=enabled"
|
||||
"-Duse_sys_xxhash=enabled"
|
||||
"-Duse_sys_openssl=enabled"
|
||||
"-Duse_sys_libmspack=enabled"
|
||||
"-Duse_sys_tree_sitter=enabled"
|
||||
];
|
||||
|
||||
|
|
@ -77,9 +80,10 @@ stdenv.mkDerivation rec {
|
|||
zlib
|
||||
lz4
|
||||
openssl
|
||||
libuv
|
||||
libmspack
|
||||
tree-sitter
|
||||
xxHash
|
||||
xz
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.18.19";
|
||||
version = "0.18.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/W+vEtK84o16AqEU3akuA2uujXjBR3E5SDujdlsty4w=";
|
||||
hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
|
|
|||
|
|
@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Static library for Sysprof capture data generation";
|
||||
license = lib.licenses.bsd2Patent;
|
||||
platforms = lib.platforms.all;
|
||||
pkgConfigModules = [ "sysprof-capture-4" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trunk-io";
|
||||
version = "1.2.4";
|
||||
version = "1.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://trunk.io/releases/launcher/${version}/trunk";
|
||||
hash = "sha256-ylQ4tcPVO367PtLtBkw+MKxoIY7b14Gse3IxnIxMtqc=";
|
||||
hash = "sha256-CLgbN5m8tFBBGUQLfJuJOEptzCYLI5GJu4fUqrKkO6k=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "mmc-utils";
|
||||
version = "unstable-2023-06-12";
|
||||
version = "unstable-2023-08-07";
|
||||
|
||||
src = fetchzip rec {
|
||||
url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz";
|
||||
passthru.rev = "6d593efc3cd00e4debd0ffc5806246390dc66242";
|
||||
sha256 = "QOrU47cTPnvJHM40Bjq51VSSinmRnXCimk1h5mt4vNw=";
|
||||
passthru.rev = "613495ecaca97a19fa7f8f3ea23306472b36453c";
|
||||
sha256 = "zOjm/YDxqU6bu6GMyQTuzuZbrCfaU4FBodRWLb8GTdE=";
|
||||
};
|
||||
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ];
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "unpoller";
|
||||
version = "2.7.20";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unpoller";
|
||||
repo = "unpoller";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6uH437q3a77c+7tH7VdYmdON+M7z4gqY/Wvj1XyT9c8=";
|
||||
hash = "sha256-1LfpMjKf1pLW2loyXWIJEQclYgNnXhSchlOD4JWRCEc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XclpyB1IBKD/ALn0nbmTugiVlf5GCca+NF2/7uVTHKs=";
|
||||
vendorHash = "sha256-mRuJ9B4u62VENQmQJTkVZHzNba224ZqewjUjGZBjdz4=";
|
||||
|
||||
ldflags = [
|
||||
"-w" "-s"
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mssql-jdbc";
|
||||
version = "12.2.0";
|
||||
version = "12.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar";
|
||||
sha256 = "sha256-Z0z9cDAF7TZ8IJr3Uh2xU0nK2+aNgerk5hO1kY+/wfY=";
|
||||
sha256 = "sha256-j9y2czUOVKJigtOsv/B+wQYSVPoKPbb5hLvv0Q3suzs=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -83,6 +83,34 @@ self: super:
|
|||
configureFlags = [ "--enable-xkb" "--enable-xinput" ]
|
||||
++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared";
|
||||
outputs = [ "out" "dev" "man" "doc" ];
|
||||
meta = attrs.meta // {
|
||||
pkgConfigModules = [
|
||||
"xcb-composite"
|
||||
"xcb-damage"
|
||||
"xcb-dpms"
|
||||
"xcb-dri2"
|
||||
"xcb-dri3"
|
||||
"xcb-glx"
|
||||
"xcb-present"
|
||||
"xcb-randr"
|
||||
"xcb-record"
|
||||
"xcb-render"
|
||||
"xcb-res"
|
||||
"xcb-screensaver"
|
||||
"xcb-shape"
|
||||
"xcb-shm"
|
||||
"xcb-sync"
|
||||
"xcb-xf86dri"
|
||||
"xcb-xfixes"
|
||||
"xcb-xinerama"
|
||||
"xcb-xinput"
|
||||
"xcb-xkb"
|
||||
"xcb-xtest"
|
||||
"xcb-xv"
|
||||
"xcb-xvmc"
|
||||
"xcb"
|
||||
];
|
||||
};
|
||||
});
|
||||
|
||||
libX11 = super.libX11.overrideAttrs (attrs: {
|
||||
|
|
@ -119,6 +147,15 @@ self: super:
|
|||
|
||||
libXdmcp = super.libXdmcp.overrideAttrs (attrs: {
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
meta = attrs.meta // {
|
||||
pkgConfigModules = [ "xdmcp" ];
|
||||
};
|
||||
});
|
||||
|
||||
libXtst = super.libXtst.overrideAttrs (attrs: {
|
||||
meta = attrs.meta // {
|
||||
pkgConfigModules = [ "xtst" ];
|
||||
};
|
||||
});
|
||||
|
||||
libXfont = super.libXfont.overrideAttrs (attrs: {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "ImageOptim";
|
||||
repo = "gifski";
|
||||
rev = version;
|
||||
sha256 = "sha256-sPsq/hntNqOdPJcoob1jrDUrLLiBEnfRoDANyFUjOuM=";
|
||||
hash = "sha256-sPsq/hntNqOdPJcoob1jrDUrLLiBEnfRoDANyFUjOuM=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
@ -35,8 +35,15 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
buildFeatures = [ "video" ];
|
||||
|
||||
# error: the crate `gifski` is compiled with the panic strategy `abort` which is incompatible with this crate's strategy of `unwind`
|
||||
doCheck = !stdenv.isDarwin;
|
||||
# When the default checkType of release is used, we get the following error:
|
||||
#
|
||||
# error: the crate `gifski` is compiled with the panic strategy `abort` which
|
||||
# is incompatible with this crate's strategy of `unwind`
|
||||
#
|
||||
# It looks like https://github.com/rust-lang/cargo/issues/6313, which does not
|
||||
# outline a solution.
|
||||
#
|
||||
checkType = "debug";
|
||||
|
||||
# error: linker `/usr/bin/x86_64-linux-gnu-gcc` not found
|
||||
postPatch = ''
|
||||
|
|
@ -49,5 +56,6 @@ rustPlatform.buildRustPackage rec {
|
|||
changelog = "https://github.com/ImageOptim/gifski/releases/tag/${src.rev}";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ figsoda marsam ];
|
||||
mainProgram = "gifski";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ perlPackages.perl libpcap ];
|
||||
|
||||
postInstall = ''
|
||||
for name in get-{oui,iab}; do
|
||||
wrapProgram "$out/bin/$name" --set PERL5LIB "${perlPackages.makeFullPerlPath perlModules}"
|
||||
for binary in get-{oui,iab}; do
|
||||
wrapProgram "$out/bin/$binary" --set PERL5LIB "${perlPackages.makeFullPerlPath perlModules}"
|
||||
done;
|
||||
'';
|
||||
|
||||
|
|
@ -33,9 +33,10 @@ stdenv.mkDerivation rec {
|
|||
Arp-scan is a command-line tool that uses the ARP protocol to discover
|
||||
and fingerprint IP hosts on the local network.
|
||||
'';
|
||||
homepage = "http://www.nta-monitor.com/wiki/index.php/Arp-scan_Documentation";
|
||||
homepage = "https://github.com/royhills/arp-scan/wiki/arp-scan-User-Guide";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ bjornfor mikoim r-burns ];
|
||||
mainProgram = "arp-scan";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,20 +11,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "atuin";
|
||||
version = "15.0.0";
|
||||
version = "16.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ellie";
|
||||
repo = pname;
|
||||
owner = "atuinsh";
|
||||
repo = "atuin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BX1WpvJMcfpepsRX0U6FJBL5/+mpUyTZxm65BbbZLJA=";
|
||||
hash = "sha256-Kh6aaWYV+ZG7Asvw5JdGsV+nxD+xvvQab5wLIedcQcQ=";
|
||||
};
|
||||
|
||||
# TODO: unify this to one hash because updater do not support this
|
||||
cargoHash =
|
||||
if stdenv.isLinux
|
||||
then "sha256-EnIR+BXw8oYlv3dpYy4gAkN/zckRI8KEAbbR9wPmMq4="
|
||||
else "sha256-hHcahzrIuXIgOv+sx0HbC9f5guTcTr6L4eeLoiQsAzA=";
|
||||
then "sha256-Ami88ScGj58jCCat4MMDvjZtV5WglmrlggpQfo+LPjs="
|
||||
else "sha256-HQMZ9w1C6go16XGrPNniQZliIQ/5yAp2w/uUwAOQTM0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
@ -41,9 +41,14 @@ rustPlatform.buildRustPackage rec {
|
|||
inherit (nixosTests) atuin;
|
||||
};
|
||||
|
||||
checkFlags = [
|
||||
# tries to make a network access
|
||||
"--skip=registration"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Replacement for a shell history which records additional commands context with optional encrypted synchronization between machines";
|
||||
homepage = "https://github.com/ellie/atuin";
|
||||
homepage = "https://github.com/atuinsh/atuin";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ SuperSandro2000 sciencentistguy _0x4A6F ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
|||
version = "4.99.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.tcpdump.org/release/tcpdump-${version}.tar.gz";
|
||||
url = "https://www.tcpdump.org/release/tcpdump-${version}.tar.gz";
|
||||
hash = "sha256-AjIjG7LynWvyQm5woIp+DGOg1ZqbRIY7f14jV6bkn+o=";
|
||||
};
|
||||
|
||||
|
|
@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ globin ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "tcpdump";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -164,8 +164,8 @@ in lib.makeExtensible (self: ({
|
|||
};
|
||||
|
||||
nix_2_13 = common {
|
||||
version = "2.13.3";
|
||||
hash = "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=";
|
||||
version = "2.13.5";
|
||||
hash = "sha256-yHZMgMs/6/aQUwfMwmPUQov17JMGS7squLJsjmucnLc=";
|
||||
patches = [
|
||||
patch-fix-aarch64-darwin-static
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# frozen_string_literal: true
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.27"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.28"
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: 53af96320f2fddfc0189ea66fd9db1f87d94eb06
|
||||
ref: refs/tags/6.3.27
|
||||
revision: fa40647fa24c91f387b6d4b84bf818c90feb8fd9
|
||||
ref: refs/tags/6.3.28
|
||||
specs:
|
||||
metasploit-framework (6.3.27)
|
||||
metasploit-framework (6.3.28)
|
||||
actionpack (~> 7.0)
|
||||
activerecord (~> 7.0)
|
||||
activesupport (~> 7.0)
|
||||
aws-sdk-ec2
|
||||
aws-sdk-ec2instanceconnect
|
||||
aws-sdk-iam
|
||||
aws-sdk-s3
|
||||
aws-sdk-ssm
|
||||
|
|
@ -36,7 +37,7 @@ GIT
|
|||
metasploit-model
|
||||
metasploit-payloads (= 2.0.148)
|
||||
metasploit_data_models
|
||||
metasploit_payloads-mettle (= 1.0.20)
|
||||
metasploit_payloads-mettle (= 1.0.26)
|
||||
mqtt
|
||||
msgpack (~> 1.6.0)
|
||||
nessus_rest
|
||||
|
|
@ -125,19 +126,22 @@ GEM
|
|||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
addressable (2.8.4)
|
||||
addressable (2.8.5)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
afm (0.2.2)
|
||||
arel-helpers (2.14.0)
|
||||
activerecord (>= 3.1.0, < 8)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.795.0)
|
||||
aws-sdk-core (3.180.1)
|
||||
aws-partitions (1.799.0)
|
||||
aws-sdk-core (3.180.2)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.651.0)
|
||||
aws-sigv4 (~> 1.5)
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
aws-sdk-ec2 (1.395.0)
|
||||
aws-sdk-ec2 (1.396.0)
|
||||
aws-sdk-core (~> 3, >= 3.177.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-ec2instanceconnect (1.32.0)
|
||||
aws-sdk-core (~> 3, >= 3.177.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-iam (1.86.0)
|
||||
|
|
@ -256,7 +260,7 @@ GEM
|
|||
railties (~> 7.0)
|
||||
recog
|
||||
webrick
|
||||
metasploit_payloads-mettle (1.0.20)
|
||||
metasploit_payloads-mettle (1.0.26)
|
||||
method_source (1.0.0)
|
||||
mini_portile2 (2.8.4)
|
||||
minitest (5.19.0)
|
||||
|
|
@ -301,11 +305,11 @@ GEM
|
|||
nio4r (~> 2.0)
|
||||
racc (1.7.1)
|
||||
rack (2.2.8)
|
||||
rack-protection (3.0.6)
|
||||
rack
|
||||
rack-protection (3.1.0)
|
||||
rack (~> 2.2, >= 2.2.4)
|
||||
rack-test (2.1.0)
|
||||
rack (>= 1.3)
|
||||
rails-dom-testing (2.1.1)
|
||||
rails-dom-testing (2.2.0)
|
||||
activesupport (>= 5.0.0)
|
||||
minitest
|
||||
nokogiri (>= 1.6)
|
||||
|
|
@ -394,10 +398,10 @@ GEM
|
|||
faraday (>= 0.17.3, < 3)
|
||||
simpleidn (0.2.1)
|
||||
unf (~> 0.1.4)
|
||||
sinatra (3.0.6)
|
||||
sinatra (3.1.0)
|
||||
mustermann (~> 3.0)
|
||||
rack (~> 2.2, >= 2.2.4)
|
||||
rack-protection (= 3.0.6)
|
||||
rack-protection (= 3.1.0)
|
||||
tilt (~> 2.0)
|
||||
sqlite3 (1.6.3)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
|
|
@ -440,9 +444,9 @@ GEM
|
|||
xdr (3.0.3)
|
||||
activemodel (>= 4.2, < 8.0)
|
||||
activesupport (>= 4.2, < 8.0)
|
||||
xmlrpc (0.3.2)
|
||||
xmlrpc (0.3.3)
|
||||
webrick
|
||||
zeitwerk (2.6.10)
|
||||
zeitwerk (2.6.11)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
|
@ -451,4 +455,4 @@ DEPENDENCIES
|
|||
metasploit-framework!
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.14
|
||||
2.4.17
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.3.27";
|
||||
version = "6.3.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-3iNzOLOASz78ZUoShKMH/AYZE+UTu31qU/VjXP677cc=";
|
||||
sha256 = "sha256-g6oM2xjfARBaVJm5AqfrqhLpa3av/0ixql2+62iuG94=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -54,10 +54,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
|
||||
sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.4";
|
||||
version = "2.8.5";
|
||||
};
|
||||
afm = {
|
||||
groups = ["default"];
|
||||
|
|
@ -104,30 +104,40 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07nz6pdzhrfzyhcnd0slikbw0xpslisis2ab57v83fbmn3rkpwn4";
|
||||
sha256 = "1fdqsz0f826w1lm1npn4qagggnjpg683vxxvyfvc37pn07zmjbhf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.795.0";
|
||||
version = "1.799.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1a820i7b3fcpnk0966sp7sdj9mzkazfwjflrd1f3i9qgbabf5li3";
|
||||
sha256 = "1sxkpg1mvg1aiqd2kp5h438qd5rjpgpx3ag0r5xsbzmij9ja3cj4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.180.1";
|
||||
version = "3.180.2";
|
||||
};
|
||||
aws-sdk-ec2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01ds6pw1q87mqbyv7v0a444lsifrv6y0sqcw3v5yrng2ap43xby7";
|
||||
sha256 = "01mcilr3qnj6pzwvv4qgdqcnpg5s1cj57b5k5gjl4bfvfyiq7x6z";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.395.0";
|
||||
version = "1.396.0";
|
||||
};
|
||||
aws-sdk-ec2instanceconnect = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1jbvh6v2kbybk1qjzhzrl82d7advh6hf3va9zyaxlrcijkz6jjg4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.32.0";
|
||||
};
|
||||
aws-sdk-iam = {
|
||||
groups = ["default"];
|
||||
|
|
@ -634,12 +644,12 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "53af96320f2fddfc0189ea66fd9db1f87d94eb06";
|
||||
sha256 = "1izdpgz5qqzmadm7vfqkwl9ij1pw0yiq84jacpy3wjw0ncw768yy";
|
||||
rev = "fa40647fa24c91f387b6d4b84bf818c90feb8fd9";
|
||||
sha256 = "1phvmrlfpgjxmaqlizxgfrmyj4maxfkh5fcraid100fz33dhral3";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.3.27";
|
||||
version = "6.3.28";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
|
|
@ -676,10 +686,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qpnpj6qpzgn8ga9p4i3ifnixy86cm32z1y43r50jnk6p534xj84";
|
||||
sha256 = "1qprmbmpw4c8396m0whbp08xzdbjc0s2zd0jkxqnh3aswmx8pj3m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.20";
|
||||
version = "1.0.26";
|
||||
};
|
||||
method_source = {
|
||||
groups = ["default"];
|
||||
|
|
@ -987,10 +997,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1kpm67az1wxlg76h620in2r7agfyhv177ps268j5ggsanzddzih8";
|
||||
sha256 = "0xsz78hccgza144n37bfisdkzpr2c8m0xl6rnlzgxdbsm1zrkg7r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.6";
|
||||
version = "3.1.0";
|
||||
};
|
||||
rack-test = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1007,10 +1017,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17g05y7q7934z0ib4aph8h71c2qwjmlakkm7nb2ab45q0aqkfgjd";
|
||||
sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
};
|
||||
rails-html-sanitizer = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1377,10 +1387,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1q0ghxfqgjhg2dq9699mn5qx6m6q2cgldg312kh41pzwwy71a7hx";
|
||||
sha256 = "00541cnypsh1mnilfxxqlz6va9afrixf9m1asn4wzjp5m59777p8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.6";
|
||||
version = "3.1.0";
|
||||
};
|
||||
sqlite3 = {
|
||||
dependencies = ["mini_portile2"];
|
||||
|
|
@ -1608,19 +1618,19 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xa79ry3976ylap38cr5g6q3m81plm611flqd3dwgnmgbkycb6jp";
|
||||
sha256 = "0fwfnccagsjrbvrav5nbk3zracj9zncr7i375nn20jd4cfy4cggc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
};
|
||||
zeitwerk = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06vf6y5ai20ry3b1h9cl7vsdj6i5valq172zdxpnfhj5zvlp104j";
|
||||
sha256 = "1mwdd445w63khz13hpv17m2br5xngyjl3jdj08xizjbm78i2zrxd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.10";
|
||||
version = "2.6.11";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5821,18 +5821,23 @@ with pkgs;
|
|||
# example of an error which this fixes
|
||||
# [Errno 8] Exec format error: './gdk3-scan'
|
||||
mesonEmulatorHook =
|
||||
if (!stdenv.buildPlatform.canExecute stdenv.targetPlatform) then
|
||||
makeSetupHook
|
||||
{
|
||||
name = "mesonEmulatorHook";
|
||||
substitutions = {
|
||||
crossFile = writeText "cross-file.conf" ''
|
||||
makeSetupHook
|
||||
{
|
||||
name = "mesonEmulatorHook";
|
||||
substitutions = {
|
||||
crossFile = writeText "cross-file.conf" ''
|
||||
[binaries]
|
||||
exe_wrapper = ${lib.escapeShellArg (stdenv.targetPlatform.emulator buildPackages)}
|
||||
exe_wrapper = ${lib.escapeShellArg (stdenv.targetPlatform.emulator pkgs)}
|
||||
'';
|
||||
};
|
||||
} ../development/tools/build-managers/meson/emulator-hook.sh
|
||||
else throw "mesonEmulatorHook has to be in a conditional to check if the target binaries can be executed i.e. (!stdenv.buildPlatform.canExecute stdenv.hostPlatform)";
|
||||
};
|
||||
}
|
||||
# The throw is moved into the `makeSetupHook` derivation, so that its
|
||||
# outer level, but not its outPath can still be evaluated if the condition
|
||||
# doesn't hold. This ensures that splicing still can work correctly.
|
||||
(if (!stdenv.hostPlatform.canExecute stdenv.targetPlatform) then
|
||||
../development/tools/build-managers/meson/emulator-hook.sh
|
||||
else
|
||||
throw "mesonEmulatorHook may only be added to nativeBuildInputs when the target binaries can't be executed; however you are attempting to use it in a situation where ${stdenv.hostPlatform.config} can execute ${stdenv.targetPlatform.config}. Consider only adding mesonEmulatorHook according to a conditional based canExecute in your package expression.");
|
||||
|
||||
meson-tools = callPackage ../misc/meson-tools { };
|
||||
|
||||
|
|
@ -10335,6 +10340,8 @@ with pkgs;
|
|||
|
||||
linux-exploit-suggester = callPackage ../tools/security/linux-exploit-suggester { };
|
||||
|
||||
linux-gpib = callPackage ../applications/science/electronics/linux-gpib/user.nix { };
|
||||
|
||||
linuxquota = callPackage ../tools/misc/linuxquota { };
|
||||
|
||||
lipl = callPackage ../tools/misc/lipl { };
|
||||
|
|
@ -12402,6 +12409,8 @@ with pkgs;
|
|||
|
||||
re-isearch = callPackage ../applications/search/re-isearch { };
|
||||
|
||||
reason-shell = callPackage ../applications/science/misc/reason-shell { };
|
||||
|
||||
reaverwps = callPackage ../tools/networking/reaver-wps { };
|
||||
|
||||
reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x { };
|
||||
|
|
@ -33970,6 +33979,8 @@ with pkgs;
|
|||
|
||||
songrec = callPackage ../applications/audio/songrec { };
|
||||
|
||||
storj-uplink = callPackage ../applications/networking/sync/storj-uplink {};
|
||||
|
||||
storrent = callPackage ../applications/networking/p2p/storrent { };
|
||||
|
||||
speedread = callPackage ../applications/misc/speedread { };
|
||||
|
|
|
|||
|
|
@ -372,6 +372,8 @@ in {
|
|||
|
||||
lenovo-legion-module = callPackage ../os-specific/linux/lenovo-legion { };
|
||||
|
||||
linux-gpib = callPackage ../applications/science/electronics/linux-gpib/kernel.nix { };
|
||||
|
||||
liquidtux = callPackage ../os-specific/linux/liquidtux {};
|
||||
|
||||
lkrg = callPackage ../os-specific/linux/lkrg {};
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ let
|
|||
else if pkg.meta.broken
|
||||
then null
|
||||
|
||||
else testers.hasPkgConfigModule { inherit moduleName; package = pkg; };
|
||||
else testers.hasPkgConfigModules { moduleNames = [ moduleName ]; package = pkg; };
|
||||
|
||||
in
|
||||
lib.recurseIntoAttrs allTests // { inherit tests-combined; }
|
||||
|
|
|
|||
|
|
@ -2758,6 +2758,8 @@ self: super: with self; {
|
|||
|
||||
django-bootstrap4 = callPackage ../development/python-modules/django-bootstrap4 { };
|
||||
|
||||
django-bootstrap5 = callPackage ../development/python-modules/django-bootstrap5 { };
|
||||
|
||||
django-cachalot = callPackage ../development/python-modules/django-cachalot { };
|
||||
|
||||
django-cache-url = callPackage ../development/python-modules/django-cache-url { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue