Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: pkgs/development/libraries/gtest/default.nix pkgs/development/libraries/hidapi/default.nix
This commit is contained in:
Alyssa Ross
commit
200610b849
2
.github/workflows/basic-eval.yml
vendored
2
.github/workflows/basic-eval.yml
vendored
|
|
@ -19,7 +19,7 @@ jobs:
|
|||
# we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: cachix/install-nix-action@v18
|
||||
- uses: cachix/install-nix-action@v19
|
||||
- uses: cachix/cachix-action@v12
|
||||
with:
|
||||
# This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
|
||||
|
|
|
|||
2
.github/workflows/editorconfig.yml
vendored
2
.github/workflows/editorconfig.yml
vendored
|
|
@ -28,7 +28,7 @@ jobs:
|
|||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v18
|
||||
- uses: cachix/install-nix-action@v19
|
||||
with:
|
||||
# nixpkgs commit is pinned so that it doesn't break
|
||||
# editorconfig-checker 2.4.0
|
||||
|
|
|
|||
2
.github/workflows/manual-nixos.yml
vendored
2
.github/workflows/manual-nixos.yml
vendored
|
|
@ -18,7 +18,7 @@ jobs:
|
|||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v18
|
||||
- uses: cachix/install-nix-action@v19
|
||||
with:
|
||||
# explicitly enable sandbox
|
||||
extra_nix_config: sandbox = true
|
||||
|
|
|
|||
2
.github/workflows/manual-nixpkgs.yml
vendored
2
.github/workflows/manual-nixpkgs.yml
vendored
|
|
@ -18,7 +18,7 @@ jobs:
|
|||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v18
|
||||
- uses: cachix/install-nix-action@v19
|
||||
with:
|
||||
# explicitly enable sandbox
|
||||
extra_nix_config: sandbox = true
|
||||
|
|
|
|||
2
.github/workflows/manual-rendering.yml
vendored
2
.github/workflows/manual-rendering.yml
vendored
|
|
@ -18,7 +18,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: cachix/install-nix-action@v18
|
||||
- uses: cachix/install-nix-action@v19
|
||||
with:
|
||||
# explicitly enable sandbox
|
||||
extra_nix_config: sandbox = true
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: cachix/install-nix-action@v18
|
||||
- uses: cachix/install-nix-action@v19
|
||||
with:
|
||||
nix_path: nixpkgs=channel:nixpkgs-unstable
|
||||
- name: setup
|
||||
|
|
|
|||
|
|
@ -171,6 +171,7 @@ let
|
|||
inherit src version;
|
||||
# nix will complain and tell you the right value to replace this with
|
||||
hash = lib.fakeHash;
|
||||
mixEnv = ""; # default is "prod", when empty includes all dependencies, such as "dev", "test".
|
||||
# if you have build time environment variables add them here
|
||||
MY_ENV_VAR="my_value";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -932,6 +932,12 @@
|
|||
githubId = 106511;
|
||||
name = "Andrew Kelley";
|
||||
};
|
||||
andrewsmith = {
|
||||
email = "andrew@velvet.software";
|
||||
github = "andrewsmith";
|
||||
githubId = 29887;
|
||||
name = "Andrew Smith";
|
||||
};
|
||||
andsild = {
|
||||
email = "andsild@gmail.com";
|
||||
github = "andsild";
|
||||
|
|
@ -12827,6 +12833,12 @@
|
|||
githubId = 5236428;
|
||||
name = "Gaëtan André";
|
||||
};
|
||||
rvnstn = {
|
||||
email = "github@rvnstn.de";
|
||||
github = "rvnstn";
|
||||
githubId = 2364742;
|
||||
name = "Tobias Ravenstein";
|
||||
};
|
||||
rvolosatovs = {
|
||||
email = "rvolosatovs@riseup.net";
|
||||
github = "rvolosatovs";
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -27,12 +27,12 @@
|
|||
};
|
||||
arduino = buildGrammar {
|
||||
language = "arduino";
|
||||
version = "c473c09";
|
||||
version = "257efff";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ObserverOfTime";
|
||||
repo = "tree-sitter-arduino";
|
||||
rev = "c473c09f23b13d9404ec5208fad3eddea89d70f8";
|
||||
hash = "sha256-aAw1ZgKuMWozQzmENUhkdkHV0BjSGmTdH4Bna7EfDaQ=";
|
||||
rev = "257efffa387da3283a37816b71dedfecf4af5222";
|
||||
hash = "sha256-Yc3oFzOMyQwW2URyEzSIe6wBNAu9J2vPFIXk43sVUv8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
|
||||
};
|
||||
|
|
@ -115,23 +115,23 @@
|
|||
};
|
||||
c_sharp = buildGrammar {
|
||||
language = "c_sharp";
|
||||
version = "a29bac0";
|
||||
version = "18e4343";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-c-sharp";
|
||||
rev = "a29bac0681802139710b4d3875540901504d15cb";
|
||||
hash = "sha256-TpOaxR0Do7oGjAZ8IrbXJAP6//Kt7VxhkrWEz7yNiLY=";
|
||||
rev = "18e434383a4582b4fd183a30e55022c2923764e1";
|
||||
hash = "sha256-ggvCj2yGDINuGr8Jb+aOoRxlKa5LaXCoiQC/Y5Hrcn0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
|
||||
};
|
||||
capnp = buildGrammar {
|
||||
language = "capnp";
|
||||
version = "740c757";
|
||||
version = "cb85cdd";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-capnp";
|
||||
rev = "740c757b9585925b1ed27cef7d61ac39b7824304";
|
||||
hash = "sha256-0zCSWV3afsEIhN6XavMnn4LrLenjerhdnTfQ/EaL4aA=";
|
||||
rev = "cb85cddfdf398530110c807ba046822dbaee6afb";
|
||||
hash = "sha256-VB8fNF8EtTAkKBLIAByazczPHJYdBULCeoGQ1ZLLRhI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-capnp";
|
||||
};
|
||||
|
|
@ -159,12 +159,12 @@
|
|||
};
|
||||
cmake = buildGrammar {
|
||||
language = "cmake";
|
||||
version = "a322653";
|
||||
version = "399605a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "uyha";
|
||||
repo = "tree-sitter-cmake";
|
||||
rev = "a32265307aa2d31941056d69e8b6633e61750b2f";
|
||||
hash = "sha256-LBd3SMem1dxZr/dOdJdEFTQxI6d+H8uYE46yN02E/6Y=";
|
||||
rev = "399605a02bcd5daa309ce63a6459c600dce3473f";
|
||||
hash = "sha256-7pzKyfR9RmfgzuX9/elUesmsdbLlwgrfiRP73YQu+gM=";
|
||||
};
|
||||
meta.homepage = "https://github.com/uyha/tree-sitter-cmake";
|
||||
};
|
||||
|
|
@ -304,12 +304,12 @@
|
|||
};
|
||||
ebnf = buildGrammar {
|
||||
language = "ebnf";
|
||||
version = "ef241bc";
|
||||
version = "8e635b0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RubixDev";
|
||||
repo = "ebnf";
|
||||
rev = "ef241bc09f2f105c35f5e4f2ccd8a522dd99071c";
|
||||
hash = "sha256-N5TGYJnYNjYIdFXspGn+dDRm0wmJymXHY+Io43wSKlI=";
|
||||
rev = "8e635b0b723c620774dfb8abf382a7f531894b40";
|
||||
hash = "sha256-Cch6WCYq9bsWGypzDGapxBLJ0ZB432uAl6YjEjBJ5yg=";
|
||||
};
|
||||
location = "crates/tree-sitter-ebnf";
|
||||
meta.homepage = "https://github.com/RubixDev/ebnf.git";
|
||||
|
|
@ -371,12 +371,12 @@
|
|||
};
|
||||
embedded_template = buildGrammar {
|
||||
language = "embedded_template";
|
||||
version = "a130858";
|
||||
version = "203f7bd";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-embedded-template";
|
||||
rev = "a13085849cf69e2401ec44e38cffc3d73f22f3df";
|
||||
hash = "sha256-JNyLOW/na8J0WEsLDv3BuC+UXxGpYMYvAlywq4z6Wzo=";
|
||||
rev = "203f7bd3c1bbfbd98fc19add4b8fcb213c059205";
|
||||
hash = "sha256-SaZkyy2wKYoK0+pdHLVpQrdXjEeX/uR5XxgahcAdwz0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template";
|
||||
};
|
||||
|
|
@ -426,12 +426,12 @@
|
|||
};
|
||||
fortran = buildGrammar {
|
||||
language = "fortran";
|
||||
version = "edcb337";
|
||||
version = "bfa6fd4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stadelmanma";
|
||||
repo = "tree-sitter-fortran";
|
||||
rev = "edcb3374f4698aaedf24bc572f6b2f5ef0e89ac7";
|
||||
hash = "sha256-xZfWtRHWy3MQtkzN9jSwx+sAwLlcRiVLTJjYXyWEIs8=";
|
||||
rev = "bfa6fd4c4aa0bb9b39ad33daa004ad4637a91d20";
|
||||
hash = "sha256-5Lf/6jhgRPgSPNCHqiYT8OeI7UUnTfQqH8rzf8ggHj0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
|
||||
};
|
||||
|
|
@ -448,12 +448,12 @@
|
|||
};
|
||||
func = buildGrammar {
|
||||
language = "func";
|
||||
version = "88ee7d0";
|
||||
version = "f161cfe";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-func";
|
||||
rev = "88ee7d0f569af10ab8c78a12f37217a8d15a0ffa";
|
||||
hash = "sha256-SLI59AtprfCQr6VccCVr+2sazEtUSXnAwHcclWrkXxA=";
|
||||
rev = "f161cfe22452b386eeeab29ba0d2c14893f1a31f";
|
||||
hash = "sha256-Swyg5EdBWVT6P9vgS7h/fmK0ySRwiFlynJEZT9I10qg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-func";
|
||||
};
|
||||
|
|
@ -470,12 +470,12 @@
|
|||
};
|
||||
gdscript = buildGrammar {
|
||||
language = "gdscript";
|
||||
version = "4849e65";
|
||||
version = "5d43d78";
|
||||
src = fetchFromGitHub {
|
||||
owner = "PrestonKnopp";
|
||||
repo = "tree-sitter-gdscript";
|
||||
rev = "4849e657b98945cd040ffa7fd833d6130259dbab";
|
||||
hash = "sha256-Rs1W2jahp+J42JzICi+QLAqfHYXth47g4LjejJnJypo=";
|
||||
rev = "5d43d78c276570f76773685f08baf9e4ada09639";
|
||||
hash = "sha256-SNyZutgab3T1UaD/D6jnhF3QmAR/UVtlXTpNjYlf2+Y=";
|
||||
};
|
||||
meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
|
||||
};
|
||||
|
|
@ -537,12 +537,12 @@
|
|||
};
|
||||
glimmer = buildGrammar {
|
||||
language = "glimmer";
|
||||
version = "c0bfd26";
|
||||
version = "40cfb72";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexlafroscia";
|
||||
repo = "tree-sitter-glimmer";
|
||||
rev = "c0bfd260cdcbe2976f4633547c218f09f7222a89";
|
||||
hash = "sha256-Goj900MJxO44KYkzD0UpGFEGHAwr6qhe2bmCzpx5BhE=";
|
||||
rev = "40cfb72a53654cbd666451ca04ffd500257c7b73";
|
||||
hash = "sha256-h9ZZz6mbkErLIG/BamNRRoRdqmuBO3v17W0uvmpbm7A=";
|
||||
};
|
||||
meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer";
|
||||
};
|
||||
|
|
@ -637,12 +637,12 @@
|
|||
};
|
||||
haskell = buildGrammar {
|
||||
language = "haskell";
|
||||
version = "aee3725";
|
||||
version = "3bdba07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-haskell";
|
||||
rev = "aee3725d02cf3bca5f307b35dd3a96a97e109b4e";
|
||||
hash = "sha256-DmrrRht3g0hG+OsJCHRL+xW4jflLqtG57AuFf7zd26c=";
|
||||
rev = "3bdba07c7a8eec23f87fa59ce9eb2ea4823348b3";
|
||||
hash = "sha256-/aGUdyVxXqXCvjruI8rqiKzfTsyxzOKaXSAUG5xK4cE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell";
|
||||
};
|
||||
|
|
@ -835,12 +835,12 @@
|
|||
};
|
||||
jsonnet = buildGrammar {
|
||||
language = "jsonnet";
|
||||
version = "505f5bd";
|
||||
version = "fdc7757";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcegraph";
|
||||
repo = "tree-sitter-jsonnet";
|
||||
rev = "505f5bd90053ae895aa3d6f2bac8071dd9abd8b2";
|
||||
hash = "sha256-XZqywAzM+UCKto/OFn50hhRpEyFVLpFV7Q1Z0NKoPsI=";
|
||||
rev = "fdc775714afa27fdef823adbaba6ab98f5ae66f2";
|
||||
hash = "sha256-KVpSB3LiC1qpF05Y1ScIglaXWIrAL+m7G4Q4/EVn0U8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/sourcegraph/tree-sitter-jsonnet";
|
||||
};
|
||||
|
|
@ -857,12 +857,12 @@
|
|||
};
|
||||
kdl = buildGrammar {
|
||||
language = "kdl";
|
||||
version = "f83f394";
|
||||
version = "b50d6c8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-kdl";
|
||||
rev = "f83f3943568c7e7b4f5e0de1b04d722223bd4d80";
|
||||
hash = "sha256-BakY6V4A2N/ZZCkyr7KU04/DWeGTAkkJua5TyZ6uNW4=";
|
||||
rev = "b50d6c8b77d311639ecbf2b803ffb720c2b4cee2";
|
||||
hash = "sha256-dE2SqRSjy05Un3DPkrVDN0+na1ahddY57RYPMtaWynA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-kdl";
|
||||
};
|
||||
|
|
@ -956,24 +956,24 @@
|
|||
};
|
||||
markdown = buildGrammar {
|
||||
language = "markdown";
|
||||
version = "abea13b";
|
||||
version = "7e7aa9a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MDeiml";
|
||||
repo = "tree-sitter-markdown";
|
||||
rev = "abea13b86c404564991244b69b7afc4ca362d0c0";
|
||||
hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU=";
|
||||
rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979";
|
||||
hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0=";
|
||||
};
|
||||
location = "tree-sitter-markdown";
|
||||
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
|
||||
};
|
||||
markdown_inline = buildGrammar {
|
||||
language = "markdown_inline";
|
||||
version = "abea13b";
|
||||
version = "7e7aa9a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MDeiml";
|
||||
repo = "tree-sitter-markdown";
|
||||
rev = "abea13b86c404564991244b69b7afc4ca362d0c0";
|
||||
hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU=";
|
||||
rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979";
|
||||
hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0=";
|
||||
};
|
||||
location = "tree-sitter-markdown-inline";
|
||||
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
|
||||
|
|
@ -1126,12 +1126,12 @@
|
|||
};
|
||||
php = buildGrammar {
|
||||
language = "php";
|
||||
version = "973694f";
|
||||
version = "f860e59";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-php";
|
||||
rev = "973694ffcdeebca245b7ecf0d7c4cadd4f41b3c9";
|
||||
hash = "sha256-upJ8WwosOe4Xv/H9LUFVUVThLSLS+5Htr71Lyc/ZTJo=";
|
||||
rev = "f860e598194f4a71747f91789bf536b393ad4a56";
|
||||
hash = "sha256-j4RJUBbp2zvCHsZwnz62t2Tf6Cy1LOKrhg/pi8cqzAs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
|
||||
};
|
||||
|
|
@ -1192,12 +1192,12 @@
|
|||
};
|
||||
pug = buildGrammar {
|
||||
language = "pug";
|
||||
version = "26f6ac8";
|
||||
version = "884e225";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zealot128";
|
||||
repo = "tree-sitter-pug";
|
||||
rev = "26f6ac805e11e19c4492089f24aa44fe71be7c1f";
|
||||
hash = "sha256-KUIjt8p4B3LrU9vRQGL9Pf3ZYMfdDrazC2kNwTpRAgg=";
|
||||
rev = "884e225b5ecca5d885ae627275f16ef648acd42e";
|
||||
hash = "sha256-qPfVSnsw9bDznq7rhzftGyv9cGi2OiF6DCh55Lxk8xA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/zealot128/tree-sitter-pug";
|
||||
};
|
||||
|
|
@ -1311,6 +1311,17 @@
|
|||
};
|
||||
meta.homepage = "https://github.com/bamonroe/tree-sitter-rnoweb";
|
||||
};
|
||||
ron = buildGrammar {
|
||||
language = "ron";
|
||||
version = "049a3ef";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-ron";
|
||||
rev = "049a3ef4e271089107dd08e4aeb195abd1f77103";
|
||||
hash = "sha256-ITWls8kp/UvwWOBE19v1UWQ1/BEiDhsK5VIFHicJM84=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-ron";
|
||||
};
|
||||
rst = buildGrammar {
|
||||
language = "rst";
|
||||
version = "25e6328";
|
||||
|
|
@ -1434,12 +1445,12 @@
|
|||
};
|
||||
sql = buildGrammar {
|
||||
language = "sql";
|
||||
version = "c508e60";
|
||||
version = "7be06f4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "derekstride";
|
||||
repo = "tree-sitter-sql";
|
||||
rev = "c508e6044adf4298d7b321f966c90cbe32d75d23";
|
||||
hash = "sha256-Ed+6pwxwvwLKOVB9XVHF+IftEiO4bG0yZAe77xBcazI=";
|
||||
rev = "7be06f4d5eabace883dd45959c13dc740f1f1b98";
|
||||
hash = "sha256-Hi/4/Aou85MYCMMFqf5xqAyKECTzfeiaksJxdv9MVCU=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
||||
|
|
@ -1538,12 +1549,12 @@
|
|||
};
|
||||
thrift = buildGrammar {
|
||||
language = "thrift";
|
||||
version = "634a73f";
|
||||
version = "763ae3d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "duskmoon314";
|
||||
repo = "tree-sitter-thrift";
|
||||
rev = "634a73fd2c80e169f302917ba665c07ec0b6ff7b";
|
||||
hash = "sha256-pB7zd48aonYYKdvD3+35zsD76+F/lqBYveFBxBQISvA=";
|
||||
rev = "763ae3d760b7a7719b57568bdf9ffae2d896680f";
|
||||
hash = "sha256-LXHXCaD76H9kWjOwCPfrpO2ZEv3mlq0IpWnwzV/qr2M=";
|
||||
};
|
||||
meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift";
|
||||
};
|
||||
|
|
@ -1560,12 +1571,12 @@
|
|||
};
|
||||
tlaplus = buildGrammar {
|
||||
language = "tlaplus";
|
||||
version = "6fd16d8";
|
||||
version = "6d2ec89";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tlaplus-community";
|
||||
repo = "tree-sitter-tlaplus";
|
||||
rev = "6fd16d8469c6898317423d61738d97e2b3f5caf7";
|
||||
hash = "sha256-s5mYc/kPZ4wHhm1ZeC5WBjBfzTFnANPRAZeE8UOVE1I=";
|
||||
rev = "6d2ec894aef843fc89312c904e20c5f555aec4e3";
|
||||
hash = "sha256-5V4sMnjVsdSJdeYspxn0nYqq73lVHvz7eGRfD/orqo4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
|
||||
};
|
||||
|
|
@ -1639,12 +1650,12 @@
|
|||
};
|
||||
v = buildGrammar {
|
||||
language = "v";
|
||||
version = "719cf0c";
|
||||
version = "136f3a0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "vls";
|
||||
rev = "719cf0cd297f9b2f45ecfbeb0115379fb8cfa9c3";
|
||||
hash = "sha256-4xb5x/JZN1pFvPVqazcZMdZm8DTpBb5nW5AgOrB3YHc=";
|
||||
rev = "136f3a0ad91ab8a781c2d4eb419df0a981839f69";
|
||||
hash = "sha256-zmbR2Of/XEJuGvNmXAJ+C4aAMem51LVS3e1rSqjaSb0=";
|
||||
};
|
||||
location = "tree_sitter_v";
|
||||
meta.homepage = "https://github.com/vlang/vls";
|
||||
|
|
@ -1684,12 +1695,12 @@
|
|||
};
|
||||
vim = buildGrammar {
|
||||
language = "vim";
|
||||
version = "55ff1b0";
|
||||
version = "e39a7bb";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vigoux";
|
||||
repo = "tree-sitter-viml";
|
||||
rev = "55ff1b080c09edeced9b748cf4c16d0b49d17fb9";
|
||||
hash = "sha256-bMh6RPP0+zpNkMS/mpbKTaug9EL6u4kTcztnEXaNGyA=";
|
||||
rev = "e39a7bbcfdcfc7900629962b785c7e14503ae590";
|
||||
hash = "sha256-f3UAHwCL5yerEjmuDp+guzX4/ik4h7ProH5P8AmdO10=";
|
||||
};
|
||||
meta.homepage = "https://github.com/vigoux/tree-sitter-viml";
|
||||
};
|
||||
|
|
@ -1750,12 +1761,12 @@
|
|||
};
|
||||
zig = buildGrammar {
|
||||
language = "zig";
|
||||
version = "b0693dd";
|
||||
version = "6b3f578";
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxxnino";
|
||||
repo = "tree-sitter-zig";
|
||||
rev = "b0693dd473efd91d6085acd8e0ff9c627d37e077";
|
||||
hash = "sha256-Jmz2XDI+mrBYE2TEhxPJZbICbhs5AOC0tyC4OOgT61U=";
|
||||
rev = "6b3f5788f38be900b45f5af5a753bf6a37d614b8";
|
||||
hash = "sha256-KwMo1gwre8/AXkXXwQqPHZIEPXM26PK8SI0p3tmkt24=";
|
||||
};
|
||||
meta.homepage = "https://github.com/maxxnino/tree-sitter-zig";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -941,6 +941,10 @@ self: super: {
|
|||
dependencies = with self; [ telescope-nvim ];
|
||||
});
|
||||
|
||||
telescope-undo-nvim = super.telescope-undo-nvim.overrideAttrs (old: {
|
||||
dependencies = with self; [ telescope-nvim ];
|
||||
});
|
||||
|
||||
telescope-z-nvim = super.telescope-z-nvim.overrideAttrs (old: {
|
||||
dependencies = with self; [ telescope-nvim ];
|
||||
});
|
||||
|
|
@ -1088,7 +1092,7 @@ self: super: {
|
|||
libiconv
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-jpO26OXaYcWirQ5tTKIwlva7dHIfdmnruF4WdwSq0nI=";
|
||||
cargoSha256 = "sha256-JQwT7IFYC/K+t3YO34hoalxdt1TEsmEcBXtDKFVdles=";
|
||||
};
|
||||
in
|
||||
''
|
||||
|
|
|
|||
|
|
@ -699,6 +699,7 @@ https://github.com/nvim-telescope/telescope-project.nvim/,,
|
|||
https://github.com/nvim-telescope/telescope-symbols.nvim/,,
|
||||
https://github.com/nvim-telescope/telescope-ui-select.nvim/,,
|
||||
https://github.com/fhill2/telescope-ultisnips.nvim/,,
|
||||
https://github.com/debugloop/telescope-undo.nvim/,HEAD,
|
||||
https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,,
|
||||
https://github.com/nvim-telescope/telescope-z.nvim/,,
|
||||
https://github.com/jvgrootveld/telescope-zoxide/,,
|
||||
|
|
|
|||
|
|
@ -927,8 +927,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "gitlens";
|
||||
publisher = "eamodio";
|
||||
version = "2022.12.604";
|
||||
sha256 = "sha256-yfqGITviASp5ZDEJA+zyVz1LpPWV4FM/4fU4eq52Xng=";
|
||||
version = "2023.2.1204";
|
||||
sha256 = "sha256-FurYfkw+mOjyymR1VCGf0jJ2JCZJ8eGb1J7zD2peBjw=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
|
||||
|
|
|
|||
|
|
@ -109,7 +109,9 @@ in
|
|||
/* menu:
|
||||
Video
|
||||
*/
|
||||
name = "gap-2.6.0";
|
||||
pname = "gap";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2";
|
||||
sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
|
||||
|
|
@ -228,7 +230,9 @@ in
|
|||
/* menu:
|
||||
Filters/Enhance/Wavelet sharpen
|
||||
*/
|
||||
name = "wavelet-sharpen-0.1.2";
|
||||
pname = "wavelet-sharpen";
|
||||
version = "0.1.2";
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: interface.o:(.bss+0xe0): multiple definition of `fimg'; plugin.o:(.bss+0x40): first defined here
|
||||
|
|
@ -271,7 +275,7 @@ in
|
|||
|
||||
gimplensfun = pluginDerivation rec {
|
||||
version = "unstable-2018-10-21";
|
||||
name = "gimplensfun-${version}";
|
||||
pname = "gimplensfun";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seebk";
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "110.0.5481.77",
|
||||
"sha256": "1kl1k29sr5qw8pg7shvizw4b37fxjlgah56p57kq641iqhnsnj73",
|
||||
"sha256bin64": "0wnzgvwbpmb5ja4ba5mjk4bk0aaxzbw4zi509vw96q6mbqmr4iwr",
|
||||
"version": "111.0.5563.19",
|
||||
"sha256": "0hrapzi45jpkb1b87nzlb896jd2h2jbz1mq91md5r2y6ag6fc55w",
|
||||
"sha256bin64": "1mjrp13xf913xhm9hz6yg595g0jg2afmwvzxzpw79y4snaf2ihza",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-12-12",
|
||||
|
|
@ -32,15 +32,15 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "111.0.5563.19",
|
||||
"sha256": "0hrapzi45jpkb1b87nzlb896jd2h2jbz1mq91md5r2y6ag6fc55w",
|
||||
"sha256bin64": "02aaqny23dcdp611n6jr7swkjnx1wd0lb8dgxq53b806f0s374cp",
|
||||
"version": "112.0.5582.0",
|
||||
"sha256": "139g5cpqxvh6bf2x3aqs4md379rwrx143f8lcsym8hgpqdwq5sfk",
|
||||
"sha256bin64": "1npksnnxcni62wx517xy64ysk3ja868gw48vgx4q8xc93g15n89c",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-12-12",
|
||||
"version": "2023-01-30",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8",
|
||||
"sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
|
||||
"rev": "84c8431f3e03cc6226c59dd49637c15ea31169a1",
|
||||
"sha256": "15dqiy1bf1cixqg23bqpfb8mrlcxqbarjwzajc5hjmivykrjn2s3"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kluctl";
|
||||
version = "2.18.4";
|
||||
version = "2.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kluctl";
|
||||
repo = "kluctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nHfJ7Dt9nAY4fY+U7W46cPRwWSgtGvwdbUjQAynOQdw=";
|
||||
hash = "sha256-2nAgJj/cMDiE5rw/YixNYQNCWnuC/8EX4BrnXN4Npao=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ADYXLcCYmlQim9KvqkXGdEXJ9cACBsRCb3emcmrL0kg=";
|
||||
vendorHash = "sha256-xBUrY8v4yHtWGaaRXHxQRGdZHzMGoJX2hFLL+0Vb1QY=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.5.22";
|
||||
version = "3.5.23";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
|
|
@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
|
|||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-I+7fTSyw5oKrad6HMxhex2wI4JLXDtoxHL4pxO3w2l8=";
|
||||
hash = "sha256-VWpcXwiQHpQ3X/rmm6fWfPfuUoUmWQMfOq5A87nED3A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
docbook_xsl_ns,
|
||||
wrapQtAppsHook,
|
||||
libusb1,
|
||||
libyamlcpp,
|
||||
qtlocation,
|
||||
qtserialport,
|
||||
qttools,
|
||||
qtbase,
|
||||
yaml-cpp,
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -39,12 +39,12 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
libyamlcpp
|
||||
libusb1
|
||||
qtlocation
|
||||
qtserialport
|
||||
qttools
|
||||
qtbase
|
||||
yaml-cpp
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString isLinux ''
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "inormalize";
|
||||
name = "${pname}-2014-10-21";
|
||||
version = "unstable-2014-10-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BIC-MNI";
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "minc-widgets";
|
||||
name = "${pname}-2016-04-20";
|
||||
|
||||
version = "unstable-2016-04-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BIC-MNI";
|
||||
|
|
|
|||
|
|
@ -8,15 +8,18 @@
|
|||
# R as of writing does not support outputting both .so and .a files; it outputs:
|
||||
# --enable-R-static-lib conflicts with --enable-R-shlib and will be ignored
|
||||
, static ? false
|
||||
, testers
|
||||
}:
|
||||
|
||||
assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "R";
|
||||
version = "4.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
src = let
|
||||
inherit (finalAttrs) pname version;
|
||||
in fetchurl {
|
||||
url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-D/YrQuxRr6VxPK7nxP3noMRZQLo5vvjFyUh/7wyVPfU=";
|
||||
};
|
||||
|
|
@ -97,6 +100,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.r-project.org/";
|
||||
description = "Free software environment for statistical computing and graphics";
|
||||
|
|
@ -121,8 +126,9 @@ stdenv.mkDerivation rec {
|
|||
user-defined recursive functions and input and output facilities.
|
||||
'';
|
||||
|
||||
pkgConfigModules = [ "libR" ];
|
||||
platforms = platforms.all;
|
||||
|
||||
maintainers = with maintainers; [ jbedo ] ++ teams.sage.members;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -10,7 +10,10 @@
|
|||
, openssl
|
||||
, libusb1
|
||||
, AppKit
|
||||
, git
|
||||
, openssh
|
||||
, testers
|
||||
, radicle-cli
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
|
@ -50,11 +53,18 @@ rustPlatform.buildRustPackage rec {
|
|||
done
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ openssh ];
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
openssh
|
||||
];
|
||||
preCheck = ''
|
||||
eval $(ssh-agent)
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion { package = radicle-cli; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Command-line tooling for Radicle, a decentralized code collaboration network";
|
||||
homepage = "https://radicle.xyz";
|
||||
|
|
|
|||
|
|
@ -28,13 +28,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "jellyfin-media-player";
|
||||
version = "1.7.1";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-media-player";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-piMqI4qxcNUSNC+0JE2KZ/cvlNgtxUOnSfrcWnBVzC0=";
|
||||
sha256 = "sha256-/FqxZd0cFSfkeBQmZ2gU+5FUZZ+WbQ8c2IjaZ4/uGt8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "jellyfin-mpv-shim";
|
||||
version = "2.2.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-JiSC6WjrLsWk3/m/EHq7KNXaJ6rqT2fG9TT1jPvYlK0=";
|
||||
sha256 = "sha256-v5enaNcZ0aoyEcOFfkAsOIwEpVZ2oqYGMkLlDepBY7c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@ let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sway-unwrapped";
|
||||
version = "1.8";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swaywm";
|
||||
repo = "sway";
|
||||
rev = version;
|
||||
hash = "sha256-r5qf50YK0Wl0gFiFdSE/J6ZU+D/Cz32u1mKzOqnIuJ0=";
|
||||
hash = "sha256-WxnT+le9vneQLFPz2KoBduOI+zfZPhn1fKlaqbPL6/g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -33,13 +33,13 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "whitesur-gtk-theme";
|
||||
version = "2022-10-27";
|
||||
version = "2023-02-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-jOrTasnkNExCgvST+09JOQ0iosjoEu3aoj3C1pNHTgY=";
|
||||
sha256 = "sha256-RGYD2+ZTUTPyFbaHvXU9VD3W6WTNeg3ifY+DAR3MmtI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -61,10 +61,10 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
|
||||
# Do not provide `sudo`, as it is not needed in our use case of the install script
|
||||
substituteInPlace lib-core.sh --replace '$(which sudo)' false
|
||||
substituteInPlace shell/lib-core.sh --replace '$(which sudo)' false
|
||||
|
||||
# Provides a dummy home directory
|
||||
substituteInPlace lib-core.sh --replace 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp'
|
||||
substituteInPlace shell/lib-core.sh --replace 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp'
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation (attrs // {
|
|||
|
||||
installPhase = attrs.installPhase or ''
|
||||
runHook preInstall
|
||||
mix deps.get --only ${mixEnv}
|
||||
mix deps.get ''${mixEnv:+--only $mixEnv}
|
||||
find "$TEMPDIR/deps" -path '*/.git/*' -a ! -name HEAD -exec rm -rf {} +
|
||||
cp -r --no-preserve=mode,ownership,timestamps $TEMPDIR/deps $out
|
||||
runHook postInstall
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A cross-language development platform for in-memory data";
|
||||
homepage = "https://arrow.apache.org/docs/cpp/";
|
||||
license = licenses.asl20;
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; # waiting on gtest changes in staging
|
||||
broken = stdenv.isLinux && stdenv.isAarch64; # waiting on gtest changes in staging
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ tobim veprbl cpcloud ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -266,6 +266,10 @@
|
|||
, MediaToolbox
|
||||
, VideoDecodeAcceleration
|
||||
, VideoToolbox
|
||||
/*
|
||||
* Testing
|
||||
*/
|
||||
, testers
|
||||
}:
|
||||
|
||||
/* Maintainer notes:
|
||||
|
|
@ -321,13 +325,13 @@ assert buildAvformat -> buildAvcodec && buildAvutil; # configure flag since 0.6
|
|||
assert buildPostproc -> buildAvutil;
|
||||
assert buildSwscale -> buildAvutil;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ffmpeg" + (if ffmpegVariant == "small" then "" else "-${ffmpegVariant}");
|
||||
inherit version;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.ffmpeg.org/ffmpeg.git";
|
||||
rev = "n${version}";
|
||||
rev = "n${finalAttrs.version}";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
|
|
@ -522,7 +526,7 @@ stdenv.mkDerivation rec {
|
|||
# outputs where we don't want them. Patch the generated config.h to remove all
|
||||
# such references except for data.
|
||||
postConfigure = let
|
||||
toStrip = lib.remove "data" outputs; # We want to keep references to the data dir.
|
||||
toStrip = lib.remove "data" finalAttrs.outputs; # We want to keep references to the data dir.
|
||||
in
|
||||
"remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${placeholder o}") toStrip)} config.h";
|
||||
|
||||
|
|
@ -656,6 +660,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A complete, cross-platform solution to record, convert and stream audio and video";
|
||||
homepage = "https://www.ffmpeg.org/";
|
||||
|
|
@ -671,7 +677,8 @@ stdenv.mkDerivation rec {
|
|||
++ optional withGPL gpl2Plus
|
||||
++ optional withGPLv3 gpl3Plus
|
||||
++ optional withUnfree unfreeRedistributable;
|
||||
pkgConfigModules = [ "libavutil" ];
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ atemu ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ lib, stdenv, cmake, ninja, fetchFromGitHub }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, ninja
|
||||
, static ? stdenv.hostPlatform.isStatic,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtest";
|
||||
|
|
@ -20,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
|
||||
] ++ lib.optionals (
|
||||
(stdenv.cc.isGNU && (lib.versionOlder stdenv.cc.version "11.0"))
|
||||
|| (stdenv.cc.isClang && (lib.versionOlder stdenv.cc.version "16.0"))
|
||||
|
|
|
|||
|
|
@ -7,16 +7,17 @@
|
|||
, udev
|
||||
, Cocoa
|
||||
, IOKit
|
||||
, testers
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hidapi";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libusb";
|
||||
repo = "hidapi";
|
||||
rev = "${pname}-${version}";
|
||||
rev = "${finalAttrs.pname}-${finalAttrs.version}";
|
||||
sha256 = "sha256-CEZP5n8qEAzsqn8dz3u1nG0YoT7J1P+WfN7urkRTuVg=";
|
||||
};
|
||||
|
||||
|
|
@ -28,12 +29,20 @@ stdenv.mkDerivation rec {
|
|||
|
||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Cocoa IOKit ];
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for communicating with USB and Bluetooth HID devices";
|
||||
homepage = "https://github.com/libusb/hidapi";
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
# You can choose between GPLv3, BSD or HIDAPI license (even more liberal)
|
||||
license = with licenses; [ bsd3 /* or */ gpl3Only ] ;
|
||||
pkgConfigModules = lib.optionals stdenv.isDarwin [
|
||||
"hidapi"
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
"hidapi-hidraw"
|
||||
"hidapi-libusb"
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, buildRootOnly ? false }:
|
||||
{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, testers
|
||||
, buildRootOnly ? false
|
||||
}:
|
||||
|
||||
import ./base.nix {
|
||||
version = "63.1";
|
||||
|
|
@ -11,4 +13,4 @@ import ./base.nix {
|
|||
})
|
||||
];
|
||||
patchFlags = [ "-p3" ];
|
||||
} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot buildRootOnly; }
|
||||
} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot testers buildRootOnly; }
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
{ stdenv, lib, fetchurl, fixDarwinDylibNames
|
||||
# Cross-compiled icu4c requires a build-root of a native compile
|
||||
, buildRootOnly ? false, nativeBuildRoot
|
||||
, testers
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -45,6 +46,11 @@ let
|
|||
description = "Unicode and globalization support library";
|
||||
homepage = "https://icu.unicode.org/";
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
pkgConfigModules = [
|
||||
"icu-i18n"
|
||||
"icu-io"
|
||||
"icu-uc"
|
||||
];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
|
|
@ -97,4 +103,6 @@ let
|
|||
then buildRootOnlyAttrs
|
||||
else realAttrs;
|
||||
in
|
||||
stdenv.mkDerivation attrs
|
||||
stdenv.mkDerivation (finalAttrs: attrs // {
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -21,17 +21,18 @@
|
|||
, fluxbox
|
||||
, enlightenment
|
||||
, xorg
|
||||
, testers
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) optional optionals;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imlib2";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.xz";
|
||||
url = "mirror://sourceforge/enlightenment/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-SiJAOL//vl1NJQxE4F9O5a4k3P74OVsWd8cVxY92TUM=";
|
||||
};
|
||||
|
||||
|
|
@ -69,6 +70,8 @@ stdenv.mkDerivation rec {
|
|||
enlightenment;
|
||||
};
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Image manipulation library";
|
||||
|
||||
|
|
@ -83,7 +86,8 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://docs.enlightenment.org/api/imlib2/html";
|
||||
changelog = "https://git.enlightenment.org/legacy/imlib2.git/plain/ChangeLog?h=v${version}";
|
||||
license = licenses.imlib2;
|
||||
pkgConfigModules = [ "imlib2" ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ spwhitt ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,16 +4,17 @@
|
|||
, autoreconfHook
|
||||
, libtool
|
||||
, pkg-config
|
||||
, testers
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libb2";
|
||||
version = "0.98.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BLAKE2";
|
||||
repo = "libb2";
|
||||
rev = "refs/tags/v${version}";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
sha256 = "0qj8aaqvfcavj1vj5asm4pqm03ap7q8x4c2fy83cqggvky0frgya";
|
||||
};
|
||||
|
||||
|
|
@ -29,11 +30,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
meta = with lib; {
|
||||
description = "The BLAKE2 family of cryptographic hash functions";
|
||||
homepage = "https://blake2.net/";
|
||||
pkgConfigModules = [ "libb2" ];
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ dfoxfranke dotlambda ];
|
||||
license = licenses.cc0;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liburing";
|
||||
version = "2.2";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchgit {
|
||||
url = "http://git.kernel.dk/${pname}";
|
||||
rev = "liburing-${version}";
|
||||
sha256 = "sha256-M/jfxZ+5DmFvlAt8sbXrjBTPf2gLd9UyTNymtjD+55g";
|
||||
sha256 = "sha256-vN6lLb5kpgHTKDxwibJPS61sdelILETVtJE2BYgp79k=";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
# path to openssl.cnf file. will be placed in $etc/etc/ssl/openssl.cnf to replace the default
|
||||
, conf ? null
|
||||
, removeReferencesTo
|
||||
, testers
|
||||
}:
|
||||
|
||||
# Note: this package is used for bootstrapping fetchurl, and thus
|
||||
|
|
@ -19,12 +20,12 @@
|
|||
|
||||
let
|
||||
common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }:
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openssl";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.openssl.org/source/${pname}-${version}.tar.gz";
|
||||
url = "https://www.openssl.org/source/${finalAttrs.pname}-${version}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
|
|
@ -204,13 +205,20 @@ let
|
|||
fi
|
||||
'';
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.openssl.org/";
|
||||
description = "A cryptographic library that implements the SSL and TLS protocols";
|
||||
license = licenses.openssl;
|
||||
pkgConfigModules = [
|
||||
"libcrypto"
|
||||
"libssl"
|
||||
"openssl"
|
||||
];
|
||||
platforms = platforms.all;
|
||||
} // extraMeta;
|
||||
};
|
||||
});
|
||||
|
||||
in {
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,17 @@
|
|||
, shared ? true
|
||||
# Compile with ILP64 interface
|
||||
, blas64 ? false
|
||||
, testers
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "liblapack";
|
||||
version = "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Reference-LAPACK";
|
||||
repo = "lapack";
|
||||
rev = "v${version}";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-AYD78u70y8cY19hmM/aDjQEzxO8u9lPWhCFxRe5cqXI=";
|
||||
};
|
||||
|
||||
|
|
@ -40,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postInstall = let
|
||||
canonicalExtension = if stdenv.hostPlatform.isLinux
|
||||
then "${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major version}"
|
||||
then "${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major finalAttrs.version}"
|
||||
else stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
in lib.optionalString blas64 ''
|
||||
ln -s $out/lib/liblapack64${canonicalExtension} $out/lib/liblapack${canonicalExtension}
|
||||
|
|
@ -65,15 +66,18 @@ stdenv.mkDerivation rec {
|
|||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
ctest ${ctestArgs}
|
||||
ctest ${finalAttrs.ctestArgs}
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linear Algebra PACKage";
|
||||
homepage = "http://www.netlib.org/lapack/";
|
||||
maintainers = with maintainers; [ markuskowa ];
|
||||
license = licenses.bsd3;
|
||||
pkgConfigModules = [ "lapack" ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@
|
|||
, enableGeoLocation ? true
|
||||
, withLibsecret ? true
|
||||
, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
|
||||
, testers
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -232,10 +233,17 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Web content rendering engine, GTK port";
|
||||
homepage = "https://webkitgtk.org/";
|
||||
license = licenses.bsd2;
|
||||
pkgConfigModules = [
|
||||
"javascriptcoregtk-4.0"
|
||||
"webkit2gtk-4.0"
|
||||
"webkit2gtk-web-extension-4.0"
|
||||
];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = teams.gnome.members;
|
||||
broken = stdenv.isDarwin;
|
||||
|
|
|
|||
|
|
@ -1,69 +1,110 @@
|
|||
{ config
|
||||
, stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, gtest
|
||||
, doCheck ? true
|
||||
, cudaSupport ? config.cudaSupport or false
|
||||
, ncclSupport ? false
|
||||
, cudaPackages
|
||||
, llvmPackages
|
||||
}:
|
||||
{ config, stdenv, lib, fetchFromGitHub, cmake, gtest, doCheck ? true
|
||||
, cudaSupport ? config.cudaSupport or false, ncclSupport ? false
|
||||
, rLibrary ? false, cudaPackages, llvmPackages, R, rPackages }:
|
||||
|
||||
assert ncclSupport -> cudaSupport;
|
||||
# Disable regular tests when building the R package
|
||||
# because 1) the R package runs its own tests and
|
||||
# 2) the R package creates a different binary shared
|
||||
# object that isn't compatible with the regular CLI
|
||||
# tests.
|
||||
assert rLibrary -> doCheck != true;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xgboost";
|
||||
pnameBase = "xgboost";
|
||||
# prefix with r when building the R library
|
||||
# The R package build results in a special xgboost.so file
|
||||
# that contains a subset of the .so file use for the CLI
|
||||
# and python version. In general, the CRAN version from
|
||||
# nixpkgs's r-modules should be used, but this non-standard
|
||||
# build allows for enabling CUDA and NCCL support which aren't
|
||||
# included in the CRAN release. Build with:
|
||||
# nix-build -E "with (import $NIXPKGS{}); \
|
||||
# let \
|
||||
# xgb = xgboost.override{rLibrary = true; doCheck = false;}; \
|
||||
# in \
|
||||
# rWrapper.override{ packages = [ xgb ]; }"
|
||||
pname = lib.optionalString rLibrary "r-" + pnameBase;
|
||||
version = "1.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmlc";
|
||||
repo = pname;
|
||||
repo = pnameBase;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-unTss2byytG8KUQfg5s34YpRuHHDLo7D/ZickHhz1AE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
llvmPackages.openmp
|
||||
] ++ lib.optionals cudaSupport [
|
||||
cudaPackages.autoAddOpenGLRunpathHook
|
||||
];
|
||||
nativeBuildInputs = [ cmake ]
|
||||
++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]
|
||||
++ lib.optionals cudaSupport [ cudaPackages.autoAddOpenGLRunpathHook ]
|
||||
++ lib.optionals rLibrary [ R ];
|
||||
|
||||
buildInputs = [ gtest ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit
|
||||
++ lib.optional ncclSupport cudaPackages.nccl;
|
||||
++ lib.optional ncclSupport cudaPackages.nccl;
|
||||
|
||||
propagatedBuildInputs = lib.optionals rLibrary [
|
||||
rPackages.data_table
|
||||
rPackages.jsonlite
|
||||
rPackages.Matrix
|
||||
];
|
||||
|
||||
cmakeFlags = lib.optionals doCheck [ "-DGOOGLE_TEST=ON" ]
|
||||
++ lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/cc" ]
|
||||
++ lib.optionals (cudaSupport && lib.versionAtLeast cudaPackages.cudatoolkit.version "11.4.0") [ "-DBUILD_WITH_CUDA_CUB=ON" ]
|
||||
++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ];
|
||||
++ lib.optionals cudaSupport [
|
||||
"-DUSE_CUDA=ON"
|
||||
"-DCUDA_HOST_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/cc"
|
||||
] ++ lib.optionals (cudaSupport
|
||||
&& lib.versionAtLeast cudaPackages.cudatoolkit.version "11.4.0")
|
||||
[ "-DBUILD_WITH_CUDA_CUB=ON" ]
|
||||
++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ]
|
||||
++ lib.optionals rLibrary [ "-DR_LIB=ON" ];
|
||||
|
||||
preConfigure = lib.optionals rLibrary ''
|
||||
substituteInPlace cmake/RPackageInstall.cmake.in --replace "CMD INSTALL" "CMD INSTALL -l $out/library"
|
||||
export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library"
|
||||
'';
|
||||
|
||||
inherit doCheck;
|
||||
|
||||
# By default, cmake build will run ctests with all checks enabled
|
||||
# If we're building with cuda, we run ctest manually so that we can skip the GPU tests
|
||||
checkPhase = lib.optionalString cudaSupport ''
|
||||
ctest --force-new-ctest-process ${lib.optionalString cudaSupport "-E TestXGBoostLib"}
|
||||
ctest --force-new-ctest-process ${
|
||||
lib.optionalString cudaSupport "-E TestXGBoostLib"
|
||||
}
|
||||
'';
|
||||
|
||||
installPhase = let
|
||||
libname = "libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
in ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -r ../include $out
|
||||
cp -r ../dmlc-core/include/dmlc $out/include
|
||||
cp -r ../rabit/include/rabit $out/include
|
||||
install -Dm755 ../lib/${libname} $out/lib/${libname}
|
||||
install -Dm755 ../xgboost $out/bin/xgboost
|
||||
runHook postInstall
|
||||
installPhase =
|
||||
let libname = "libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
in ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -r ../include $out
|
||||
cp -r ../dmlc-core/include/dmlc $out/include
|
||||
cp -r ../rabit/include/rabit $out/include
|
||||
'' + lib.optionalString (!rLibrary) ''
|
||||
install -Dm755 ../lib/${libname} $out/lib/${libname}
|
||||
install -Dm755 ../xgboost $out/bin/xgboost
|
||||
''
|
||||
# the R library option builds a completely different binary xgboost.so instead of
|
||||
# libxgboost.so, which isn't full featured for python and CLI
|
||||
+ lib.optionalString rLibrary ''
|
||||
mkdir $out/library
|
||||
export R_LIBS_SITE="$out/library:$R_LIBS_SITE''${R_LIBS_SITE:+:}"
|
||||
make install -l $out/library
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString rLibrary ''
|
||||
if test -e $out/nix-support/propagated-build-inputs; then
|
||||
ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
|
||||
fi
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library";
|
||||
description =
|
||||
"Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library";
|
||||
homepage = "https://github.com/dmlc/xgboost";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, asynctest
|
||||
, buildPythonPackage
|
||||
, aio-geojson-client
|
||||
, fetchFromGitHub
|
||||
|
|
@ -33,7 +32,6 @@ buildPythonPackage rec {
|
|||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
asynctest
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, aio-geojson-client
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, asynctest
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
|
|
@ -32,12 +31,14 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
asynctest
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aresponses
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aio_geojson_usgs_earthquakes"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -66,6 +66,10 @@ buildPythonPackage rec {
|
|||
"TestVMDKConversion"
|
||||
# CLI test fails with AssertionError
|
||||
"test_help"
|
||||
# Failing TestCOTDeployESXi tests
|
||||
"test_serial_fixup_stubbed"
|
||||
"test_serial_fixup_stubbed_create"
|
||||
"test_serial_fixup_stubbed_vm_not_found"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"test_serial_fixup_invalid_host"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,70 +0,0 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, configargparse
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
, appdirs
|
||||
, readlike
|
||||
, requests
|
||||
, reparser
|
||||
, protobuf
|
||||
, urwid
|
||||
, mechanicalsoup
|
||||
, httpretty
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hangups";
|
||||
version = "0.4.18";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tdryer";
|
||||
repo = "hangups";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vq1OrOUPMQtezBFlisP2f/bvvYprDjhOuwUcT8rmIvw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "protobuf>=3.1.0,<4" "protobuf" \
|
||||
--replace "MechanicalSoup>=0.6.0,<0.13" "MechanicalSoup"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
configargparse
|
||||
aiohttp
|
||||
async-timeout
|
||||
appdirs
|
||||
readlike
|
||||
requests
|
||||
reparser
|
||||
protobuf
|
||||
urwid
|
||||
mechanicalsoup
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
httpretty
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"hangups"
|
||||
"hangups.client"
|
||||
"hangups.event"
|
||||
"hangups.parsers"
|
||||
"hangups.user"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The first third-party instant messaging client for Google Hangouts";
|
||||
homepage = "https://github.com/tdryer/hangups";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, pythonAtLeast
|
||||
, subunit
|
||||
, testrepository
|
||||
, testtools
|
||||
|
|
@ -13,7 +14,7 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "mox3";
|
||||
version = "1.1.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.6" || pythonAtLeast "3.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, cython
|
||||
, nose
|
||||
, matplotlib
|
||||
, nibabel
|
||||
|
|
@ -21,9 +22,14 @@ buildPythonPackage rec {
|
|||
sha256 = "a8a2c97ce854fece4aced5a6394b9fdca5846150ad6d2a36b86590924af3c848";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
buildInputs = lib.optionals doCheck [ nose ];
|
||||
propagatedBuildInputs = [ matplotlib nibabel numpy scipy sympy ];
|
||||
|
||||
preBuild = ''
|
||||
make recythonize
|
||||
'';
|
||||
|
||||
checkPhase = '' # wants to be run in a different directory
|
||||
mkdir nosetests
|
||||
cd nosetests
|
||||
|
|
|
|||
|
|
@ -1,35 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, python3
|
||||
, bash
|
||||
, cmake
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, gtest
|
||||
, isPy27
|
||||
, nbval
|
||||
, numpy
|
||||
, protobuf
|
||||
, pybind11
|
||||
, pytestCheckHook
|
||||
, six
|
||||
, tabulate
|
||||
, typing-extensions
|
||||
, pythonRelaxDepsHook
|
||||
, pytest-runner
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
let
|
||||
gtestStatic = gtest.override { static = true; };
|
||||
in buildPythonPackage rec {
|
||||
pname = "onnx";
|
||||
version = "1.13.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-QQs5lQNnhX+XtlCTaB/iSVouI9Y3d6is6vlsVqFtFm4=";
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-D8POBAkZVr0O5i4qsSuYRkDfL8WsDTqzgNACmmkFwGs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pythonRelaxDepsHook
|
||||
pybind11
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "protobuf" ];
|
||||
|
|
@ -44,30 +51,36 @@ buildPythonPackage rec {
|
|||
nativeCheckInputs = [
|
||||
nbval
|
||||
pytestCheckHook
|
||||
pytest-runner
|
||||
tabulate
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x tools/protoc-gen-mypy.sh.in
|
||||
patchShebangs tools/protoc-gen-mypy.sh.in
|
||||
|
||||
substituteInPlace setup.py \
|
||||
--replace 'setup_requires.append("pytest-runner")' ""
|
||||
|
||||
# prevent from fetching & building own gtest
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'include(googletest)' ""
|
||||
substituteInPlace cmake/unittest.cmake \
|
||||
--replace 'googletest)' ')'
|
||||
'';
|
||||
|
||||
# Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set
|
||||
# to lib64 and cmake incorrectly looks for the protobuf library in lib64
|
||||
preConfigure = ''
|
||||
# Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set
|
||||
# to lib64 and cmake incorrectly looks for the protobuf library in lib64
|
||||
export CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DONNX_USE_PROTOBUF_SHARED_LIBS=ON"
|
||||
'' + lib.optionalString doCheck ''
|
||||
export CMAKE_ARGS+=" -Dgoogletest_STATIC_LIBRARIES=${gtestStatic}/lib/libgtest.a -Dgoogletest_INCLUDE_DIRS=${lib.getDev gtestStatic}/include"
|
||||
export ONNX_BUILD_TESTS=1
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
export MAX_JOBS=$NIX_BUILD_CORES
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# Unexpected output fields from running code: {'stderr'}
|
||||
"onnx/examples/np_array_tensorproto.ipynb"
|
||||
];
|
||||
|
||||
# The executables are just utility scripts that aren't too important
|
||||
postInstall = ''
|
||||
rm -r $out/bin
|
||||
|
|
@ -76,6 +89,35 @@ buildPythonPackage rec {
|
|||
# The setup.py does all the configuration
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
# detecting source dir as a python package confuses pytest
|
||||
mv onnx/__init__.py onnx/__init__.py.hidden
|
||||
'';
|
||||
pytestFlagsArray = [ "onnx/test" "onnx/examples" ];
|
||||
disabledTests = [
|
||||
# attempts to fetch data from web
|
||||
"test_bvlc_alexnet_cpu"
|
||||
"test_densenet121_cpu"
|
||||
"test_inception_v1_cpu"
|
||||
"test_inception_v2_cpu"
|
||||
"test_resnet50_cpu"
|
||||
"test_shufflenet_cpu"
|
||||
"test_squeezenet_cpu"
|
||||
"test_vgg19_cpu"
|
||||
"test_zfnet512_cpu"
|
||||
];
|
||||
disabledTestPaths = [
|
||||
# Unexpected output fields from running code: {'stderr'}
|
||||
"onnx/examples/np_array_tensorproto.ipynb"
|
||||
];
|
||||
postCheck = ''
|
||||
# run "cpp" tests
|
||||
.setuptools-cmake-build/onnx_gtests
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"onnx"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pefile";
|
||||
version = "2022.5.30";
|
||||
version = "2023.2.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "erocarrera";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Cv20hJsErHFSuS5Q1kqLNp4DAsPXv/eFhaU9oYECSeI=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lD8GpNl+cVNYTZUKFRF1/2kDwEbn/ekRBNBTYuFmFW0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -38,6 +38,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Multi-platform Python module to parse and work with Portable Executable (aka PE) files";
|
||||
homepage = "https://github.com/erocarrera/pefile";
|
||||
changelog = "https://github.com/erocarrera/pefile/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pamplemousse ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-mpv-jsonipc";
|
||||
version = "1.1.11";
|
||||
version = "1.1.14";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iwalton3";
|
||||
repo = "python-mpv-jsonipc";
|
||||
rev = "v${version}";
|
||||
sha256 = "034vc2j54dciiq80k7jn6kx4g7i58sjk0ykma039k5rihj2rblpk";
|
||||
sha256 = "sha256-kOC6FsLYTVx/cCL8AZuGkKarHqAESjJA+2BUagbiy3A=";
|
||||
};
|
||||
|
||||
# 'mpv-jsonipc' does not have any tests
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, loguru
|
||||
|
|
@ -10,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-utils";
|
||||
version = "3.4.5";
|
||||
version = "3.5.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "WoLpH";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-O/+jvdzzxUFaQdAfUM9p40fPPDNN+stTauCD993HH6Y=";
|
||||
hash = "sha256-FFBWkq7ct4JWSTH4Ldg+pbG/BAiW33puB7lqFPBjptw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -47,6 +48,11 @@ buildPythonPackage rec {
|
|||
"_python_utils_tests"
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.isDarwin [
|
||||
# Flaky tests on darwin
|
||||
"test_timeout_generator"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module with some convenient utilities";
|
||||
homepage = "https://github.com/WoLpH/python-utils";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonAtLeast
|
||||
, fetchPypi
|
||||
, flit
|
||||
, hypothesis
|
||||
|
|
@ -9,15 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "validobj";
|
||||
version = "0.6";
|
||||
version = "0.7";
|
||||
format = "pyproject";
|
||||
|
||||
# https://github.com/Zaharid/validobj/issues/8
|
||||
disabled = pythonAtLeast "3.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-BvnHn0Erk87Ce3tYwYf0tBwRJMrG19Af/Y568VJ02uo=";
|
||||
sha256 = "cbij55HZKVLO3MLoDTtFT2YYNVZwbNaYEk+35gIcGdo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit ];
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "versioningit";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-c/KWXjDS6/1/+ra/JjaPIjdXBiLdKknH+8GZXenGdtY=";
|
||||
hash = "sha256-6xjnunJoqIC/HM/pLlNOlqs04Dl/KNy8s/wNpPaltr0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lua-language-server";
|
||||
version = "3.6.10";
|
||||
version = "3.6.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luals";
|
||||
repo = "lua-language-server";
|
||||
rev = version;
|
||||
sha256 = "sha256-QnkWEf1Uv+CZwEyv1b3WMPvaOZEn+mKH5w3CPyw02CQ=";
|
||||
sha256 = "sha256-NMybClvpTLad7xnd8uPhUHmv6fvaYIKkFHsv7SSDi2M=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -77,6 +77,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A language server that offers Lua language support";
|
||||
homepage = "https://github.com/luals/lua-language-server";
|
||||
changelog = "https://github.com/LuaLS/lua-language-server/blob/${version}/changelog.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda sei40kr ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-semver-checks";
|
||||
version = "0.17.1";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "obi1kenobi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zObflf9BKq24km54LW7It4Lvff0OKYNDb02uatdX7g4=";
|
||||
sha256 = "sha256-ugcmsm1j2a1wOnUe9u70yoRXALCmtXSnb80N4B4IUWE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-itL6WpM4OLn4mzdB0ytM2J7F1fRDrXwCaI/8WdLo6y0=";
|
||||
cargoSha256 = "sha256-PxnPCevjVvmFMlmYv6qwIBZk2MThz65hgUyVhm2tzlc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
@ -29,9 +29,9 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
checkFlags = [
|
||||
# requires nightly version of cargo-rustdoc
|
||||
"--skip=dump::tests"
|
||||
"--skip=query::tests"
|
||||
"--skip=verify_binary_contains_lints"
|
||||
"--skip=rustdoc_cmd::tests"
|
||||
];
|
||||
|
||||
# use system openssl
|
||||
|
|
|
|||
13
pkgs/development/tools/squawk/correct-Cargo.lock.patch
Normal file
13
pkgs/development/tools/squawk/correct-Cargo.lock.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index d5803a8..384224d 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1585,7 +1585,7 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
|
||||
|
||||
[[package]]
|
||||
name = "squawk"
|
||||
-version = "0.19.0"
|
||||
+version = "0.20.0"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"base64 0.12.3",
|
||||
67
pkgs/development/tools/squawk/default.nix
Normal file
67
pkgs/development/tools/squawk/default.nix
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
{ darwin
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, libiconv
|
||||
, libpg_query
|
||||
, openssl
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, stdenv
|
||||
}:
|
||||
let
|
||||
# The query parser produces a slightly different AST between major versions
|
||||
# and Squawk is not capable of handling >=14 correctly yet.
|
||||
libpg_query13 = libpg_query.overrideAttrs (_: rec {
|
||||
version = "13-2.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pganalyze";
|
||||
repo = "libpg_query";
|
||||
rev = version;
|
||||
hash = "sha256-gEkcv/j8ySUYmM9lx1hRF/SmuQMYVHwZAIYOaCQWAFs=";
|
||||
};
|
||||
});
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "squawk";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sbdchd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-v9F+HfscX4dIExIP1YvxOldZPPtmxh8lO3SREu6M+C0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kSaQxqom8LSCOQBoIZ1iv+q2+Ih8l61L97xXv5c4a0k=";
|
||||
|
||||
cargoPatches = [
|
||||
./correct-Cargo.lock.patch
|
||||
];
|
||||
|
||||
patches = [
|
||||
./fix-postgresql-version-in-snapshot-test.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals (!stdenv.isDarwin) [
|
||||
libiconv
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
CoreFoundation
|
||||
Security
|
||||
]);
|
||||
|
||||
LIBPG_QUERY_PATH = libpg_query13;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linter for PostgreSQL, focused on migrations";
|
||||
homepage = "https://squawkhq.com/";
|
||||
changelog = "https://github.com/sbdchd/squawk/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ andrewsmith ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap b/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap
|
||||
index 7273b74..ae94927 100644
|
||||
--- a/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap
|
||||
+++ b/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap
|
||||
@@ -133,7 +133,7 @@ Ok(
|
||||
}),
|
||||
]),
|
||||
"version": Number(
|
||||
- 130003,
|
||||
+ 130008,
|
||||
),
|
||||
}),
|
||||
)
|
||||
27
pkgs/development/tools/wgo/default.nix
Normal file
27
pkgs/development/tools/wgo/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wgo";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bokwoon95";
|
||||
repo = "wgo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kfa3Lm2oJomhoHbtSPLylRr+BFGV/y7xqSIv3xHHg3Q=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jxyO3MGrC+y/jJuwur/+tLIsbxGnT57ZXYzaf1lCv7A=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Live reload for Go apps";
|
||||
homepage = "https://github.com/bokwoon95/wgo";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bokwoon95 ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -10,6 +10,8 @@
|
|||
|
||||
# Extra options
|
||||
, prefix ? ""
|
||||
|
||||
, testers
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
|
@ -25,7 +27,7 @@ let
|
|||
optAlsaLib = if libOnly then null else shouldUsePkg alsa-lib;
|
||||
optLibopus = shouldUsePkg libopus;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "${prefix}jack2";
|
||||
version = "1.9.19";
|
||||
|
||||
|
|
@ -63,11 +65,14 @@ stdenv.mkDerivation rec {
|
|||
wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH
|
||||
'');
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
meta = {
|
||||
description = "JACK audio connection kit, version 2 with jackdbus";
|
||||
homepage = "https://jackaudio.org";
|
||||
license = licenses.gpl2Plus;
|
||||
pkgConfigModules = [ "jack" ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ goibhniu ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
|
||||
# Optional Dependencies
|
||||
, alsa-lib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null
|
||||
|
||||
, testers
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -13,12 +15,12 @@ let
|
|||
optLibffado = shouldUsePkg libffado;
|
||||
optCelt = shouldUsePkg celt;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jack1";
|
||||
version = "0.125.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz";
|
||||
url = "https://jackaudio.org/downloads/jack-audio-connection-kit-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm";
|
||||
};
|
||||
|
||||
|
|
@ -30,11 +32,14 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ optAlsaLib optDb optLibffado optCelt ];
|
||||
propagatedBuildInputs = [ optLibuuid ];
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "JACK audio connection kit";
|
||||
homepage = "https://jackaudio.org";
|
||||
license = with licenses; [ gpl2 lgpl21 ];
|
||||
pkgConfigModules = [ "jack" ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -33,5 +33,8 @@ stdenvNoCC.mkDerivation rec {
|
|||
priority = 6; # give precedence to kernel firmware
|
||||
};
|
||||
|
||||
passthru = { inherit version; };
|
||||
passthru = {
|
||||
inherit version;
|
||||
updateScript = ./update.sh;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vsmtp";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "viridIT";
|
||||
repo = "vsmtp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FI4BvU+83nTzRLJQZ1l1eOn41ZeA62Db+p3d//5o0Wk=";
|
||||
hash = "sha256-iyjtSeus1gctylYfXAEqpwZNPg/KU/lXv82Wi0h5mAM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Qhhh0riM1qeD3/JZINvY0t5fEOj+prI0fyXagdR43sc=";
|
||||
cargoHash = "sha256-N4cxAFAFtYnd1/wdomm0VYosDY5uy+0z9pRGThSMbG4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "uptime-kuma";
|
||||
version = "1.19.6";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "louislam";
|
||||
repo = "uptime-kuma";
|
||||
rev = version;
|
||||
sha256 = "sha256-Hk0me4VPP8vKp4IhzQKjjhM2BWLGSHnN7JiDJu2WlE8=";
|
||||
sha256 = "sha256-dMjhCsTjXOwxhvJeL25KNkFhRCbCuxG7Ccz8mP7P38A=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-lVMPxUe+W/FlFQS2L+/UfpC21pIKJE89clmJywSv7w4=";
|
||||
npmDepsHash = "sha256-Ks6KYHP6+ym9PGJ1a5nMxT7JXZyknHeaCmAkjJuCTXU=";
|
||||
|
||||
patches = [
|
||||
# Fixes the permissions of the database being not set correctly
|
||||
|
|
|
|||
|
|
@ -5,4 +5,10 @@
|
|||
url = "https://storage.googleapis.com/${name}/${name}-stable/${version}/${name}-${version}-wordpress.zip";
|
||||
hash = "sha256-XsNFxVL0LF+OHlsqjjTV41x9ERLwMDq9BnKKP3Px2aI=";
|
||||
};
|
||||
themes.geist = fetchzip rec {
|
||||
name = "geist";
|
||||
version = "2.0.3";
|
||||
url = "https://github.com/christophery/geist/archive/refs/tags/${version}.zip";
|
||||
hash = "sha256-c85oRhqu5E5IJlpgqKJRQITur1W7x40obOvHZbPevzU=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,18 +4,19 @@
|
|||
, cmake
|
||||
, fetchpatch
|
||||
, staticOnly ? stdenv.hostPlatform.isStatic
|
||||
, testers
|
||||
}:
|
||||
|
||||
# ?TODO: there's also python lib in there
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "brotli";
|
||||
version = "1.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "brotli";
|
||||
rev = "v${version}";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c=";
|
||||
};
|
||||
|
||||
|
|
@ -55,6 +56,8 @@ stdenv.mkDerivation rec {
|
|||
cp ../docs/*.3 $out/share/man/man3/
|
||||
'';
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/google/brotli";
|
||||
description = "A generic-purpose lossless compression algorithm and tool";
|
||||
|
|
@ -72,6 +75,10 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
pkgConfigModules = [
|
||||
"libbrotlidec"
|
||||
"libbrotlienc"
|
||||
];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, cmake
|
||||
, ffmpeg
|
||||
, libdrm
|
||||
, libglvnd
|
||||
, libffi
|
||||
|
|
@ -29,6 +30,7 @@ let
|
|||
# does not search for system-wide installations.
|
||||
# It also expects the version specified in the repository, which can be incompatible
|
||||
# with the version in nixpkgs (e.g. for SPIRV-Headers), so we don't want to patch in our packages.
|
||||
# The revisions are extracted from https://github.com/KhronosGroup/VK-GL-CTS/blob/main/external/fetch_sources.py#L290
|
||||
amber = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "amber";
|
||||
|
|
@ -44,43 +46,49 @@ let
|
|||
glslang = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "glslang";
|
||||
rev = "22d39cd684d136a81778cc17a0226ffad40d1cee";
|
||||
hash = "sha256-6LplxN7HOMK1NfeD32P5JAMpCBlouttxLEOT/XTVpLw=";
|
||||
rev = "a0ad0d7067521fff880e36acfb8ce453421c3f25";
|
||||
hash = "sha256-ZKkFHGitLjw5LPJW1TswIJ+KulkrS8C4G3dUF5U/F2c=";
|
||||
};
|
||||
spirv-tools = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Tools";
|
||||
rev = "b930e734ea198b7aabbbf04ee1562cf6f57962f0";
|
||||
hash = "sha256-NWpFSRoxtYWi+hLUt9gpw0YScM3shcUwv9yUmbivRb0=";
|
||||
rev = "f98473ceeb1d33700d01e20910433583e5256030";
|
||||
hash = "sha256-RSUmfp9QZ7yRbLdFygz9mDfrgUUT8og+ZD9/6VkghMo=";
|
||||
};
|
||||
spirv-headers = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Headers";
|
||||
rev = "36c0c1596225e728bd49abb7ef56a3953e7ed468";
|
||||
hash = "sha256-t1UMJnYONWOtOxc9zUgxr901QFNvqkgurjpFA8UzhYc=";
|
||||
rev = "87d5b782bec60822aa878941e6b13c0a9a954c9b";
|
||||
hash = "sha256-Bv10LM6YXaH2V64oqAcrps23higHzCjlIYYBob5zS4A=";
|
||||
};
|
||||
video-parser = fetchFromGitHub {
|
||||
owner = "nvpro-samples";
|
||||
repo = "vk_video_samples";
|
||||
rev = "7d68747d3524842afaf050c5e00a10f5b8c07904";
|
||||
hash = "sha256-L5IYDm0bLq+NlNrzozu0VQx8zL1na6AhrkjZKxOWSnU=";
|
||||
};
|
||||
vulkan-docs = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-Docs";
|
||||
rev = "135da3a538263ef0d194cab25e2bb091119bdc42";
|
||||
hash = "sha256-VZ8JxIuOEG7IjsVcsJOcC+EQeZbd16/+czLcO9t7dY4=";
|
||||
rev = "9a2e576a052a1e65a5d41b593e693ff02745604b";
|
||||
hash = "sha256-DBA2FeV0G/HI8GUMtGYO52jk7wM4HMlKLDA4b+Wmo+k=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vulkan-cts";
|
||||
version = "1.3.4.1";
|
||||
version = "1.3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "VK-GL-CTS";
|
||||
rev = "${finalAttrs.pname}-${finalAttrs.version}";
|
||||
hash = "sha256-XUFlYdudyRqa6iupB8N5QkUpumasyLLQEWcr4M4uP1g=";
|
||||
hash = "sha256-RPuhcLJ5Ad41SFPjJBdghcNBPIGzZBeVWTjySWOp0KA=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" ];
|
||||
|
||||
prePatch = ''
|
||||
mkdir -p external/renderdoc/src external/spirv-headers external/vulkan-docs
|
||||
mkdir -p external/renderdoc/src external/spirv-headers external/video-parser external/vulkan-docs
|
||||
|
||||
cp -r ${renderdoc} external/renderdoc/src/renderdoc_app.h
|
||||
|
||||
|
|
@ -89,11 +97,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
cp -r ${glslang} external/glslang/src
|
||||
cp -r ${spirv-tools} external/spirv-tools/src
|
||||
cp -r ${spirv-headers} external/spirv-headers/src
|
||||
cp -r ${video-parser} external/video-parser/src
|
||||
cp -r ${vulkan-docs} external/vulkan-docs/src
|
||||
chmod u+w -R external
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg
|
||||
libdrm
|
||||
libffi
|
||||
libglvnd
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hoard";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Hyde46";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WCyu6vW0l8J2Xh8OGXMXVDBs287m2nPlRHeA0j8uvlk=";
|
||||
sha256 = "sha256-Gm3X6/g5JQJEl7wRvWcO4j5XpROhtfRJ72LNaUeZRGc=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses openssl ]
|
||||
|
|
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
cargoSha256 = "sha256-Cku9NnrjWT7VmOCryb0sbCQibG+iU9CHT3Cvd6M/9f4=";
|
||||
cargoHash = "sha256-ZNhUqnsme1rczl3FdFBGGs+vBDFcFEELkPp0/udTfR4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI command organizer written in rust";
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "noti";
|
||||
version = "3.6.0";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "variadico";
|
||||
repo = "noti";
|
||||
rev = version;
|
||||
sha256 = "sha256-FhVpw6PJcm0aYQBlN7AUjOkJgCzleOHXIXumSegtxfA=";
|
||||
hash = "sha256-8CHSbKOiWNYqKBU1kqQm5t02DJq0JfoIaPsU6Ylc46E=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pspg";
|
||||
version = "5.7.2";
|
||||
version = "5.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okbob";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-IwkvQ3zKdnZ0lefmRQCxD5aeMw7aFbUzfFQZG7GtXlo=";
|
||||
sha256 = "sha256-HZ771Q1UXnRds6o3EnZMyeu7Lt3IDFVFiUTc5snU0Bo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
|
|
@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
|
|||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage pspg.1
|
||||
installShellCompletion --bash --cmd pspg bash-completion.sh
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, fetchurl, jdk, buildFHSUserEnv, unzip, makeDesktopItem }:
|
||||
let
|
||||
version = "2022.12.7";
|
||||
version = "2023.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
name = "burpsuite.jar";
|
||||
|
|
@ -8,7 +8,7 @@ let
|
|||
"https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
|
||||
"https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
|
||||
];
|
||||
sha256 = "2e354c2aadc58267bc282dde462d20b3aca7108077eb141d49f89a16172763cf";
|
||||
sha256 = "620829b1a7bf9228e8671273d2f56f6dee4f16662712bcb4370923cb9d9a7540";
|
||||
};
|
||||
|
||||
name = "burpsuite-${version}";
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
let
|
||||
pname = "mozillavpn";
|
||||
version = "2.13.0";
|
||||
version = "2.13.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla-mobile";
|
||||
repo = "mozilla-vpn-client";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-EwHuNJZpTb7oFOKKDv0zWgklUe95Th97KP9G5DqRokA=";
|
||||
hash = "sha256-moXCtAFJyNkotYxBZSRP24tNHy5Rb6YW7mSKHDn9oXk=";
|
||||
};
|
||||
|
||||
netfilter-go-modules = (buildGoModule {
|
||||
|
|
@ -40,19 +40,19 @@ let
|
|||
inherit src;
|
||||
name = "${pname}-${version}-extension-bridge";
|
||||
preBuild = "cd extension/bridge";
|
||||
hash = "sha256-q6Wf+jrGjGMiDEmnErnDau6Li64Dyq8t2SN1I4rspBY=";
|
||||
hash = "sha256-/gRP7Th2HnoEQU8psf0797Tq6md4+P5zR13z3U9xlrI=";
|
||||
};
|
||||
signatureDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}-signature";
|
||||
preBuild = "cd signature";
|
||||
hash = "sha256-Dbu4WX2u3uDDUuZzS/hczypSFkQNnvuj2Su2X0QvSN4=";
|
||||
hash = "sha256-IBT7qTNbGVutR90wUhm7+9tLehDfrYDHTDkBz8hD6G0=";
|
||||
};
|
||||
vpngleanDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}-vpnglean";
|
||||
preBuild = "cd vpnglean";
|
||||
hash = "sha256-FDkziDDup+D7Bh+Wclqxn8Dhm/T2DanhjKXIAEFDhzc=";
|
||||
hash = "sha256-vQDXsoKyawdVFIQZfH8LD+ehGk692ZcAwtou4OoqLNI=";
|
||||
};
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
, zlib
|
||||
, vpnc-scripts
|
||||
, PCSC
|
||||
, useDefaultExternalBrowser ? true
|
||||
, useDefaultExternalBrowser ? stdenv.isLinux && stdenv.buildPlatform == stdenv.hostPlatform # xdg-utils doesn't cross-compile
|
||||
, xdg-utils
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ gmp libxml2 stoken zlib (if useOpenSSL then openssl else gnutls) ]
|
||||
++ lib.optional stdenv.isDarwin PCSC
|
||||
++ lib.optional stdenv.isLinux p11-kit
|
||||
++ lib.optional (stdenv.isLinux && useDefaultExternalBrowser) xdg-utils;
|
||||
++ lib.optional useDefaultExternalBrowser xdg-utils;
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, makeWrapper
|
||||
, openresolv
|
||||
, procps
|
||||
, bash
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -24,6 +25,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = [ bash ];
|
||||
|
||||
makeFlags = [
|
||||
"DESTDIR=$(out)"
|
||||
"PREFIX=/"
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nix-index";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bennofs";
|
||||
repo = "nix-index";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TDGtnSgY897fRm1BWLlQZQa8v6Wu5/JIF4UH+1CZm4U=";
|
||||
sha256 = "sha256-/btQP7I4zpIA0MWEQJVYnR1XhyudPnYD5Qx4vrW+Uq8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-z1lLpZBD4HjO6gLw96wbucfchRgZs26Q8Gl+hpUB1xo=";
|
||||
cargoSha256 = "sha256-CzLBOLtzIYqdWjTDKHVnc1YXXyj1HqvXzoFYHS0qxog=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl curl sqlite ]
|
||||
|
|
|
|||
55
pkgs/tools/security/enc/default.nix
Normal file
55
pkgs/tools/security/enc/default.nix
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "enc";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "life4";
|
||||
repo = "enc";
|
||||
rev = "v${version}";
|
||||
sha256 = "Tt+J/MnYJNewSl5UeewS0b47NGW2yzfcVHA5+9UQWSs=";
|
||||
};
|
||||
vendorSha256 = "lB6GkE6prfBG7OCOJ1gm23Ee5+nAgmJg8I9Nqe1fsRw=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
subPackages = ".";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/life4/enc/version.GitCommit=${version}"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ git ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd enc \
|
||||
--bash <($out/bin/enc completion bash) \
|
||||
--fish <($out/bin/enc completion fish) \
|
||||
--zsh <($out/bin/enc completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/life4/enc";
|
||||
changelog = "https://github.com/life4/enc/releases/tag/v${version}";
|
||||
description = "A modern and friendly alternative to GnuPG";
|
||||
longDescription = ''
|
||||
Enc is a CLI tool for encryption, a modern and friendly alternative to GnuPG.
|
||||
It is easy to use, secure by default and can encrypt and decrypt files using password or encryption keys,
|
||||
manage and download keys, and sign data.
|
||||
Our goal was to make encryption available to all engineers without the need to learn a lot of new words, concepts,
|
||||
and commands. It is the most beginner-friendly CLI tool for encryption, and keeping it that way is our top priority.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rvnstn ];
|
||||
};
|
||||
}
|
||||
|
|
@ -13,18 +13,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gopass";
|
||||
version = "1.15.3";
|
||||
version = "1.15.4";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopasspw";
|
||||
repo = pname;
|
||||
repo = "gopass";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xXXlpr+qwks+hWTPMu9xJVIamLriipzm0XQqOpg8Ipw=";
|
||||
hash = "sha256-Jm5H36DI6Mqdnm34+GUMEYxEefXLxgnwWo4fhKOayxY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Tb7eIv2G/VfRP1J6taJjAOtZQakA2pcocZ9kZemcZo0=";
|
||||
vendorHash = "sha256-IJSEU6a3AhA/cVTWXhVtNtvA/D0hyRlqL7pec1Tlyio=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "git-credential-gopass";
|
||||
version = "1.15.3";
|
||||
version = "1.15.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopasspw";
|
||||
repo = pname;
|
||||
repo = "git-credential-gopass";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-x8hf1cZw+Hhizp8/vA8qJ+A6ERJUenjMeiuW8IFb/N0=";
|
||||
hash = "sha256-S97KQ/yCyE1wBDao5KBKWPvoH+DmwpEJRiB6uJCGyFA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YZoz7B12/VhWZRTDEVs2P36FrZoZs4OdPJMkR9H7D5I=";
|
||||
vendorHash = "sha256-MLnfTdYR4/1qtnNCUs0TwGf5wMqE+V8jNCefeClQKfw=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gopass-hibp";
|
||||
version = "1.15.3";
|
||||
version = "1.15.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopasspw";
|
||||
repo = pname;
|
||||
repo = "gopass-hibp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KqW1q3CnniNeQFypeZ6x/ov58SOMfAX5P2MMDKjMYBg=";
|
||||
hash = "sha256-tqZVzYO3yKyUxfC+pxG+QuW9GBoPBteOdJMchepZ1jo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-w1Kxocrwcgn0g6ZBJ7obHraHK397bJltUFkm+/p4H5Y=";
|
||||
vendorHash = "sha256-48KwEcB5KRUwrKCuyNhhuSVRXE3U5/yVYE2xO05AeF8=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gopass-jsonapi";
|
||||
version = "1.15.3";
|
||||
version = "1.15.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopasspw";
|
||||
repo = pname;
|
||||
repo = "gopass-jsonapi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5thMhZr/ZlMHMKS2ZOyuua1ZfQ2od7QGSDBQsVsf9Os=";
|
||||
hash = "sha256-gizUFoe+oAmEKHMlua/zsR+fUltGw2cp98XAgXzCm0U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Gt5nd+3BkNQrdcq5+a70rdBXvCang/2ayZuyyZWON64=";
|
||||
vendorHash = "sha256-vMrP6rC0uPsRyFZdU2E9mPp031eob+36NcGueNP1Y7o=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gopass-summon-provider";
|
||||
version = "1.15.3";
|
||||
version = "1.15.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopasspw";
|
||||
repo = pname;
|
||||
repo = "gopass-summon-provider";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YnCX+DDZoKbiwbT8lNvAh0ANNCtEPvaLr9LCvLX8nwo=";
|
||||
hash = "sha256-gwvrwLJTh58PiRsEC3juhnA/q6cX3nRh/hiunKnPvDQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YZoz7B12/VhWZRTDEVs2P36FrZoZs4OdPJMkR9H7D5I=";
|
||||
vendorHash = "sha256-MLnfTdYR4/1qtnNCUs0TwGf5wMqE+V8jNCefeClQKfw=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,36 @@
|
|||
{ lib, stdenv, fetchFromGitHub, openssl, trousers, autoreconfHook, libtool, bison, flex }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, bison
|
||||
, flex
|
||||
, openldap
|
||||
, openssl
|
||||
, trousers
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opencryptoki";
|
||||
version = "3.8.2";
|
||||
version = "3.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencryptoki";
|
||||
repo = "opencryptoki";
|
||||
rev = "v${version}";
|
||||
sha256 = "1rf7cmibmx636vzv7p54g212478a8wim2lfjf2861hfd0m96nv4l";
|
||||
hash = "sha256-ym13I34H3d1JuVBnItkceUbqpjYFhD+mPgWYHPetF7Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook libtool bison flex ];
|
||||
buildInputs = [ openssl trousers ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
bison
|
||||
flex
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openldap
|
||||
openssl
|
||||
trousers
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
|
|
@ -20,18 +38,22 @@ stdenv.mkDerivation rec {
|
|||
--replace "groupadd" "true" \
|
||||
--replace "chmod" "true" \
|
||||
--replace "chgrp" "true"
|
||||
substituteInPlace usr/lib/Makefile.am --replace "DESTDIR" "out"
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--prefix=$(out)"
|
||||
"--prefix="
|
||||
"--disable-ccatok"
|
||||
"--disable-icatok"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installFlags = [
|
||||
"DESTDIR=${placeholder "out"}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/opencryptoki/opencryptoki/blob/${src.rev}/ChangeLog";
|
||||
description = "PKCS#11 implementation for Linux";
|
||||
homepage = "https://github.com/opencryptoki/opencryptoki";
|
||||
license = licenses.cpl10;
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vault";
|
||||
version = "1.12.2";
|
||||
version = "1.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "vault";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-P/mQoW4lG6U83WEjn5urpFa7q5mN+XOrIOkzf2pslwQ=";
|
||||
sha256 = "sha256-ZNk9bmZwD1aUY3fYT5Qngoq+9qXgvH/nWSWc30st7nE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Z1iwJXbnSqIu/zo7iKLnh0yy1Dh0e5HwXoBkkt9xaqA=";
|
||||
vendorHash = "sha256-sPpTB3N1w0JppHcwdyLYwSxjzzUAJcBJ5zJ2u4rXXkQ=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "d2";
|
||||
version = "0.1.6";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terrastruct";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bPEEL4t5R/2DnO1IKaTV5NIfT+RL9MVRuoBLlsSPJgM=";
|
||||
hash = "sha256-1AFioXDIh+qQYhhIaQky2SkGd+amnYdOeoNDU+1+poI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IKISxtAo9zKV6nLGAUNjtNb/YzRK2QO7Wa4RSNthzPU=";
|
||||
vendorHash = "sha256-PtKKGHzxshahecbfvvo1nGCseap4o8r8raBpFDUSbx4=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdbook-katex";
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-DZ+5rYRHS5m4Alw6/Ak98UH2FD3EPBGDtB+vD0v8EMk=";
|
||||
hash = "sha256-LeI46x5M2ZYUOIxuj9bCNwwucRLvoOkdRhsowmVxS68=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-i6u7kriLFgMSJDfA6JRjTLc3Oi8GfHjE7wEJbTLnMN8=";
|
||||
cargoHash = "sha256-pEwPnE2EpS+0bw3/SSKOCy8R5xUiG6mBMoup6wbrf+0=";
|
||||
|
||||
OPENSSL_DIR = "${lib.getDev openssl}";
|
||||
OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdbook-pdf";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-v57Geqd1YCzR9oM97K+Y9OdeokzNc4Kbh0sDP0+vxjU=";
|
||||
hash = "sha256-822RQKgedxQ+VFNDv20tFUc2Xl56Ivub+/EXNrLRfGM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mZUif1qBREM/5GYJU9m20p3rC3fnbZELcEKatwhoQEU=";
|
||||
cargoHash = "sha256-mX2EKjuWM1KW8DXFdYFKQfASjdqZCW78F1twZNQQr7o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -2,37 +2,47 @@
|
|||
1itl: { # no indentation
|
||||
$a}
|
||||
|
||||
# trash packages we don't want
|
||||
/^name .*\./,/^$/d
|
||||
|
||||
# quote package names, as some start with a number :-/
|
||||
s/^name (.*)/name "\1"/
|
||||
|
||||
# extract revision
|
||||
s/^revision ([0-9]*)$/ revision = \1;/p
|
||||
|
||||
# form an attrmap per package
|
||||
/^name /s/^name (.*)/\1 = {/p
|
||||
/^$/,1i};
|
||||
# ignore packages whose name contains "." (such as binaries)
|
||||
/^name ([^.]+)$/,/^$/{
|
||||
# quote package names, as some start with a number :-/
|
||||
s/^name (.*)$/"\1" = {/p
|
||||
/^$/,1i};
|
||||
|
||||
# extract hashes of *.tar.xz
|
||||
s/^containerchecksum (.*)/ sha512.run = "\1";/p
|
||||
s/^doccontainerchecksum (.*)/ sha512.doc = "\1";/p
|
||||
s/^srccontainerchecksum (.*)/ sha512.source = "\1";/p
|
||||
/^runfiles /i\ hasRunfiles = true;
|
||||
# extract revision
|
||||
s/^revision ([0-9]*)$/ revision = \1;/p
|
||||
|
||||
# number of path components to strip, defaulting to 1 ("texmf-dist/")
|
||||
/^relocated 1/i\ stripPrefix = 0;
|
||||
# extract hashes of *.tar.xz
|
||||
s/^containerchecksum (.*)/ sha512.run = "\1";/p
|
||||
s/^doccontainerchecksum (.*)/ sha512.doc = "\1";/p
|
||||
s/^srccontainerchecksum (.*)/ sha512.source = "\1";/p
|
||||
/^runfiles /i\ hasRunfiles = true;
|
||||
|
||||
# extract version and clean unwanted chars from it
|
||||
/^catalogue-version/y/ \/~/_--/
|
||||
/^catalogue-version/s/[\#,:\(\)]//g
|
||||
s/^catalogue-version_(.*)/ version = "\1";/p
|
||||
# number of path components to strip, defaulting to 1 ("texmf-dist/")
|
||||
/^relocated 1/i\ stripPrefix = 0;
|
||||
|
||||
# extract deps
|
||||
s/^depend ([^.]*)$/ deps."\1" = tl."\1";/p
|
||||
# extract version and clean unwanted chars from it
|
||||
/^catalogue-version/y/ \/~/_--/
|
||||
/^catalogue-version/s/[\#,:\(\)]//g
|
||||
s/^catalogue-version_(.*)/ version = "\1";/p
|
||||
|
||||
# extract hyphenation patterns and formats
|
||||
# (this may create duplicate lines, use uniq to remove them)
|
||||
/^execute\sAddHyphen/i\ hasHyphens = true;
|
||||
/^execute\sAddFormat/i\ hasFormats = true;
|
||||
# extract deps
|
||||
/^depend [^.]+$/{
|
||||
s/^depend (.+)$/ deps."\1" = tl."\1";/
|
||||
|
||||
# loop through following depend lines
|
||||
:next
|
||||
h ; N # save & read next line
|
||||
s/\ndepend (.+)\.(.+)$//
|
||||
s/\ndepend (.+)$/\n deps."\1" = tl."\1";/
|
||||
t next # loop if the previous lines matched
|
||||
|
||||
x; p; x # print saved deps
|
||||
s/^.*\n// # remove deps, resume processing
|
||||
}
|
||||
|
||||
# extract hyphenation patterns and formats
|
||||
# (this may create duplicate lines, use uniq to remove them)
|
||||
/^execute\sAddHyphen/i\ hasHyphens = true;
|
||||
/^execute\sAddFormat/i\ hasFormats = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5666,6 +5666,8 @@ with pkgs;
|
|||
|
||||
sqlint = callPackage ../development/tools/sqlint { };
|
||||
|
||||
squawk = callPackage ../development/tools/squawk { };
|
||||
|
||||
antibody = callPackage ../shells/zsh/antibody { };
|
||||
|
||||
antigen = callPackage ../shells/zsh/antigen { };
|
||||
|
|
@ -7042,6 +7044,8 @@ with pkgs;
|
|||
boost = boost172;
|
||||
};
|
||||
|
||||
enc = callPackage ../tools/security/enc { };
|
||||
|
||||
endlessh = callPackage ../servers/endlessh { };
|
||||
|
||||
endlessh-go = callPackage ../servers/endlessh-go { };
|
||||
|
|
|
|||
|
|
@ -102,6 +102,7 @@ mapAliases ({
|
|||
grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21
|
||||
ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06
|
||||
HAP-python = hap-python; # added 2021-06-01
|
||||
hangups = throw "hangups was removed because Google Hangouts has been shut down"; # added 2023-02-13
|
||||
hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07
|
||||
hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
|
||||
hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29
|
||||
|
|
|
|||
|
|
@ -4242,8 +4242,6 @@ self: super: with self; {
|
|||
|
||||
handout = callPackage ../development/python-modules/handout { };
|
||||
|
||||
hangups = callPackage ../development/python-modules/hangups { };
|
||||
|
||||
hap-python = callPackage ../development/python-modules/hap-python { };
|
||||
|
||||
hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue