gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Weijia Wang
2023-11-12 19:45:20 +01:00
parent 2c237f6180 12c5150ee5
commit 74d102ce50
61 changed files with 956 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+7
View File
@@ -7486,6 +7486,13 @@
githubId = 1550265;
name = "Dominic Steinitz";
};
iFreilicht = {
github = "iFreilicht";
githubId = 9742635;
matrix = "@ifreilicht:matrix.org";
email = "nixpkgs@mail.felix-uhl.de";
name = "Felix Uhl";
};
ifurther = {
github = "ifurther";
githubId = 55025025;
nixos/modules/services/networking/nix-serve.nix
+2
View File
@@ -67,6 +67,8 @@ in
};
config = mkIf cfg.enable {
nix.settings.extra-allowed-users = [ "nix-serve" ];
systemd.services.nix-serve = {
description = "nix-serve binary cache server";
after = [ "network.target" ];
nixos/modules/tasks/network-interfaces.nix
+1 -1
View File
@@ -498,7 +498,7 @@ in
option will result in an evaluation error if the hostname is empty or
no domain is specified.
Modules that accept a mere `networing.hostName` but prefer a fully qualified
Modules that accept a mere `networking.hostName` but prefer a fully qualified
domain name may use `networking.fqdnOrHostName` instead.
'';
};
pkgs/applications/editors/vim/plugins/generated.nix
+244 -244
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+102 -69
View File
@@ -39,12 +39,12 @@
};
arduino = buildGrammar {
language = "arduino";
version = "0.0.0+rev=db929fc";
version = "0.0.0+rev=ff1045f";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-arduino";
rev = "db929fc6822b9b9e1211678d508f187894ce0345";
hash = "sha256-PXBXtsyqAIgykaU/LLIakokmmWqTdicsUG4A8hA28yU=";
rev = "ff1045f5da90344d547022c50f1756be4adaf721";
hash = "sha256-8qPkmLxe4DrZyVjiEYGTWlLnXDzMV/7ZlDFDAPY+jTE=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
};
@@ -72,12 +72,12 @@
};
awk = buildGrammar {
language = "awk";
version = "0.0.0+rev=90c8d9b";
version = "0.0.0+rev=4b4b46c";
src = fetchFromGitHub {
owner = "Beaglefoot";
repo = "tree-sitter-awk";
rev = "90c8d9b47edcf7e2d67680c6649d5f6358d2ce06";
hash = "sha256-XbjZtEkJLaecp+j8xgYOVC3ESC1o/rNAZgePsmDdgps=";
rev = "4b4b46c9a44ec7fb9e8c9ce4a010295edc5be8d5";
hash = "sha256-bHlll+YgRpv4cSxzNAfVhexeMB7rgkzy3pdOZ5DW1ww=";
};
meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk";
};
@@ -138,12 +138,12 @@
};
bitbake = buildGrammar {
language = "bitbake";
version = "0.0.0+rev=6cb07d9";
version = "0.0.0+rev=ffe6c2f";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-bitbake";
rev = "6cb07d98f1cad180b8ea28965e59ee05023a5693";
hash = "sha256-KfX0vzxHn4XVtmjOSPl31t17e+rSEoSacjAFQCl4+Ik=";
rev = "ffe6c2f3dbf30224479a28ca5d50df594b2486a9";
hash = "sha256-K9z533lsurYMznmHeSKfqpy5KfE2/NpqP9bpLrA+pLw=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-bitbake";
};
@@ -204,12 +204,12 @@
};
chatito = buildGrammar {
language = "chatito";
version = "0.0.0+rev=c80c219";
version = "0.0.0+rev=871622a";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-chatito";
rev = "c80c219da2086696202cec8fc2501c02f4819a3f";
hash = "sha256-CN/FKq+ygqraPELaDJRkCSq9DEcVCpNByz5iA2WRAWU=";
rev = "871622a3a483f0baf94923d8495c8e0bb2c09009";
hash = "sha256-w4dCrAgb7/qQvFvo2RbfN0bRaUO8RKtReKx5i7SbTF8=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-chatito";
};
@@ -437,12 +437,12 @@
};
dtd = buildGrammar {
language = "dtd";
version = "0.0.0+rev=9deacbf";
version = "0.0.0+rev=a3bfa1a";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-xml";
rev = "9deacbfb79cb3527a0396255beb17e1bba3f2052";
hash = "sha256-3ryZXRgsBaNKBBHUhJ8ANHYunOUMzthMI7gw+6lnooQ=";
rev = "a3bfa1ae7e8400ab81a6358f5e8d2983f5dd0697";
hash = "sha256-01zkVlkLGAlMV4bKlxwypvMizQ13FSRSuiLZCSuJy3Q=";
};
location = "tree-sitter-dtd";
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xml";
@@ -538,12 +538,12 @@
};
erlang = buildGrammar {
language = "erlang";
version = "0.0.0+rev=bb06a83";
version = "0.0.0+rev=35ae91b";
src = fetchFromGitHub {
owner = "WhatsApp";
repo = "tree-sitter-erlang";
rev = "bb06a83db4f0c176875d9d49756b760d15211134";
hash = "sha256-IAUX5wrVpAj50cG0hrclhCx9x1hjSKdjqvEUYpe5a+g=";
rev = "35ae91b2e9f5514c0ad6d6887f9859f28907c7d5";
hash = "sha256-sA1Sy2yHBACDlicLYX+BLdcy4cnpleaYYVcjPcgHtW0=";
};
meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
};
@@ -681,12 +681,12 @@
};
gitattributes = buildGrammar {
language = "gitattributes";
version = "0.0.0+rev=f58a4a4";
version = "0.0.0+rev=19d554d";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-gitattributes";
rev = "f58a4a4bc55b9b43dfa7c4106257422764f97776";
hash = "sha256-COCQXia5TiPjJ8/WZELB2lARbn/5YeNvunrm+GHFDQs=";
rev = "19d554d39e4a8491f7a77abcdb75bfbc1c19d0b5";
hash = "sha256-/mbnDUMVeyFmkkk/9AdhTvAjSeZcyc2rFgzaPJBiNs4=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gitattributes";
};
@@ -714,12 +714,12 @@
};
gleam = buildGrammar {
language = "gleam";
version = "0.0.0+rev=0589025";
version = "0.0.0+rev=3f93ccc";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = "tree-sitter-gleam";
rev = "0589025ee57e335fe0698190a1bc322748d8f026";
hash = "sha256-/lNo6p4hsl7TiWzIdJOuSHu0RFwPYdZGIVzlcgKOWr4=";
rev = "3f93cccaf278cc4c9cf9a373ea2f6389174d634c";
hash = "sha256-TjyAaxEtGVjnBdcw1uyeQhotNhZlQKvN1SgbZwKvm3M=";
};
meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
};
@@ -758,12 +758,12 @@
};
go = buildGrammar {
language = "go";
version = "0.0.0+rev=bbaa67a";
version = "0.0.0+rev=ff86c7f";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-go";
rev = "bbaa67a180cfe0c943e50c55130918be8efb20bd";
hash = "sha256-G7d8CHCyKDAb9j6ijRfHk/HlgPqSI+uvkuRIRRvjkHI=";
rev = "ff86c7f1734873c8c4874ca4dd95603695686d7a";
hash = "sha256-0oXApYf6Ht9xWrWMMaumac1Rqg52GMYW0bAhRbQ8To0=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-go";
};
@@ -813,12 +813,12 @@
};
gpg = buildGrammar {
language = "gpg";
version = "0.0.0+rev=9c26b66";
version = "0.0.0+rev=18b2690";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-gpg-config";
rev = "9c26b66d6bca0bd0520269e98241709806561bd5";
hash = "sha256-OybtJVKiQYpftPA+jMyOjswxtkLHvqqyLbmZkKkBFZc=";
rev = "18b2690a15f061a6ff48730589f7a4039af2d002";
hash = "sha256-KLyXe1Xt1OPHmOMGX+ulVdjDhBpE31lO7/nGNiI4wt0=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gpg-config";
};
@@ -1033,12 +1033,12 @@
};
janet_simple = buildGrammar {
language = "janet_simple";
version = "0.0.0+rev=3c6f947";
version = "0.0.0+rev=77f8418";
src = fetchFromGitHub {
owner = "sogaiu";
repo = "tree-sitter-janet-simple";
rev = "3c6f947f9039bbd803d9f3cf57dcee3783b3e2ce";
hash = "sha256-wpiI0KQ4fy7fGTT3+oDfQy9zEuWmF5P/xSc1pLeA++I=";
rev = "77f8418fdba7b402350e4817bbb54816bbc627d2";
hash = "sha256-WnJ5RvPZx/+BkaOoTHV/yZQ+HFf60Nj9xoylt+3AgqA=";
};
meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple";
};
@@ -1165,15 +1165,26 @@
};
kotlin = buildGrammar {
language = "kotlin";
version = "0.0.0+rev=494fb76";
version = "0.0.0+rev=0ef8789";
src = fetchFromGitHub {
owner = "fwcd";
repo = "tree-sitter-kotlin";
rev = "494fb7644a9d2bbe4c7a0c5db2ef94d2aad6b0d8";
hash = "sha256-AnUqNfqs8QMeiwltaVNnYGxEnqCeAyTi4nNEyUsH8F0=";
rev = "0ef87892401bb01c84b40916e1f150197bc134b1";
hash = "sha256-A48osbWX8rkM5UlHcSX3t7PJ97IhsNe+JUTB4fnkDAE=";
};
meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
};
kusto = buildGrammar {
language = "kusto";
version = "0.0.0+rev=8353a12";
src = fetchFromGitHub {
owner = "Willem-J-an";
repo = "tree-sitter-kusto";
rev = "8353a1296607d6ba33db7c7e312226e5fc83e8ce";
hash = "sha256-CZCvgOtHjCgyzKFdys+ZvSWCj1I1/b2MnaJcdAtm2aY=";
};
meta.homepage = "https://github.com/Willem-J-an/tree-sitter-kusto";
};
lalrpop = buildGrammar {
language = "lalrpop";
version = "0.0.0+rev=06ae1b6";
@@ -1308,24 +1319,24 @@
};
markdown = buildGrammar {
language = "markdown";
version = "0.0.0+rev=aaf7679";
version = "0.0.0+rev=cd705f1";
src = fetchFromGitHub {
owner = "MDeiml";
repo = "tree-sitter-markdown";
rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee";
hash = "sha256-4HofUc+OsI3d2CN9mex5ROwuRHyB6fGow8gl0fe5es4=";
rev = "cd705f159127c947cd92ac163c6b17b5dcba7f94";
hash = "sha256-bVXzdGApDNAaYeWCgpGQfHDHUb0v6eixJcKYONQUbCw=";
};
location = "tree-sitter-markdown";
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
};
markdown_inline = buildGrammar {
language = "markdown_inline";
version = "0.0.0+rev=aaf7679";
version = "0.0.0+rev=cd705f1";
src = fetchFromGitHub {
owner = "MDeiml";
repo = "tree-sitter-markdown";
rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee";
hash = "sha256-4HofUc+OsI3d2CN9mex5ROwuRHyB6fGow8gl0fe5es4=";
rev = "cd705f159127c947cd92ac163c6b17b5dcba7f94";
hash = "sha256-bVXzdGApDNAaYeWCgpGQfHDHUb0v6eixJcKYONQUbCw=";
};
location = "tree-sitter-markdown-inline";
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
@@ -1376,12 +1387,12 @@
};
mlir = buildGrammar {
language = "mlir";
version = "0.0.0+rev=e2053f7";
version = "0.0.0+rev=650a8fb";
src = fetchFromGitHub {
owner = "artagnon";
repo = "tree-sitter-mlir";
rev = "e2053f7c8856d91bc36c87604f697784845cee69";
hash = "sha256-u41Qyyu9bNbcAjfTUoq2W2LvfqPpJ62xzaaAg3VbTsA=";
rev = "650a8fb72013ba8d169bdb458e480d640fc545c9";
hash = "sha256-Xmn5WaOgvAVyr1Bgzr+QG9G/kymtl4CUvLL5SPZdikU=";
};
generate = true;
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -1589,12 +1600,12 @@
};
perl = buildGrammar {
language = "perl";
version = "0.0.0+rev=e99bb52";
version = "0.0.0+rev=3911403";
src = fetchFromGitHub {
owner = "tree-sitter-perl";
repo = "tree-sitter-perl";
rev = "e99bb5283805db4cb86c964722d709df21b0ac16";
hash = "sha256-PiQIHB94UYvm0fHeBcjJiegcfZ3Rqhs1lxusGdXQ5zI=";
rev = "3911403cba497196fb867a6f1e286e3e1576f425";
hash = "sha256-/BS3taDAcjTaPfqhKyh6dnA5N9E8n4oSZepdcJVAIsw=";
};
meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl";
};
@@ -1655,12 +1666,12 @@
};
poe_filter = buildGrammar {
language = "poe_filter";
version = "0.0.0+rev=d7b43b5";
version = "0.0.0+rev=374f618";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-poe-filter";
rev = "d7b43b51f92fb19efe8af45c2246087c611c8f63";
hash = "sha256-83gE+dY1ldK5zFcEtqY3zZgk+MMrSA8w5alqp2sa/7Y=";
rev = "374f618de179498c2a821136bb86c3edbe221e10";
hash = "sha256-X6PQQqY7fLB9AvCMfLlZ2cU8dKoCsw1KGjzYup8BoJ8=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter";
};
@@ -1753,6 +1764,17 @@
};
meta.homepage = "https://github.com/amaanq/tree-sitter-puppet";
};
purescript = buildGrammar {
language = "purescript";
version = "0.0.0+rev=5ef5592";
src = fetchFromGitHub {
owner = "postsolar";
repo = "tree-sitter-purescript";
rev = "5ef5592674ea42de75fc2792972e4ea0b6e3da6c";
hash = "sha256-V9cuENH/tpXt9mfZqJ2v4dxJvbwEHU8Ri+UxQafWemY=";
};
meta.homepage = "https://github.com/postsolar/tree-sitter-purescript";
};
pymanifest = buildGrammar {
language = "pymanifest";
version = "0.0.0+rev=8953f91";
@@ -2121,12 +2143,12 @@
};
ssh_config = buildGrammar {
language = "ssh_config";
version = "0.0.0+rev=9dcfe0f";
version = "0.0.0+rev=6ac08de";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-ssh-config";
rev = "9dcfe0f30ccbde8115790c72acbde4c04ec8e74e";
hash = "sha256-X7zfOxOVZ99vbCqRSt3rhtiaolByRPspldu9XF1B/XY=";
rev = "6ac08decae456ef2fc307977d9210f86d75d4eca";
hash = "sha256-heXyWK3yPqej2jbTFYTDR3uY6JH4KvPVyCDjZzVNcTw=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config";
};
@@ -2187,12 +2209,12 @@
};
swift = buildGrammar {
language = "swift";
version = "0.0.0+rev=7e4ccc9";
version = "0.0.0+rev=b3bfaad";
src = fetchFromGitHub {
owner = "alex-pinkus";
repo = "tree-sitter-swift";
rev = "7e4ccc97a25315022a70b730085deccd5680a39b";
hash = "sha256-1Uln7GHlgtNd7/3+FSBNDlTCqYodRbUyytPZYf660Nk=";
rev = "b3bfaad89426a062c2a5d971cfebb7262f8cff62";
hash = "sha256-8rPtZmxfg1jHGqD4oKWfJpsVtk3cPPuwylJOWGXhtB0=";
};
generate = true;
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@@ -2300,12 +2322,12 @@
};
tlaplus = buildGrammar {
language = "tlaplus";
version = "0.0.0+rev=7ba226c";
version = "0.0.0+rev=204e858";
src = fetchFromGitHub {
owner = "tlaplus-community";
repo = "tree-sitter-tlaplus";
rev = "7ba226cf85280c7917d082940022006e6a3b7b6f";
hash = "sha256-OszsJIzggkPRor8aulnpHP0vPT+8fVfDtiIdUiAAqFU=";
rev = "204e858899f7dd5713dea7b0148d6aa477d4a18f";
hash = "sha256-AzCXFr6YAmbmEiBEN6MI+MeBDoEDrJB2vcZl/OEUqmg=";
};
meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
};
@@ -2400,6 +2422,17 @@
};
meta.homepage = "https://github.com/Teddytrombone/tree-sitter-typoscript";
};
udev = buildGrammar {
language = "udev";
version = "0.0.0+rev=baeac48";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-udev";
rev = "baeac48a999abb9384cdcce320f0182937aec8ba";
hash = "sha256-XEbCi9Oo5mTiocdh8Uqr5XQ3nqH3MBZjZusGd076NWE=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-udev";
};
ungrammar = buildGrammar {
language = "ungrammar";
version = "0.0.0+rev=debd26f";
@@ -2447,12 +2480,12 @@
};
v = buildGrammar {
language = "v";
version = "0.0.0+rev=e14fdf6";
version = "0.0.0+rev=099a85f";
src = fetchFromGitHub {
owner = "v-analyzer";
repo = "v-analyzer";
rev = "e14fdf6e661b10edccc744102e4ccf0b187aa8ad";
hash = "sha256-ERtjgmnXzXyuKLxVy6Pi89B59BaB87JIzZqaWMZPR9k=";
rev = "099a85fbd34a8b9db9f83da19f184bd4c1886e7c";
hash = "sha256-0Z4sljC+rkBRSPdLpzSawLdNcwE0QqrowULs9NXFrrc=";
};
location = "tree_sitter_v";
meta.homepage = "https://github.com/v-analyzer/v-analyzer";
@@ -2547,12 +2580,12 @@
};
wing = buildGrammar {
language = "wing";
version = "0.0.0+rev=61ed52f";
version = "0.0.0+rev=a30e8ec";
src = fetchFromGitHub {
owner = "winglang";
repo = "wing";
rev = "61ed52fa76a1797b7d22b831959b3abbbfdb7a05";
hash = "sha256-SE4BKB1IKsvNFeqrLAzajSfB9dbLQlSSvSpzOBNChcQ=";
rev = "a30e8eca90b7a7deb3a85503dbdd172a68ba0e05";
hash = "sha256-B0XQ9C70AsbtDXZfZUcuoQf26rbiPcQrHrobrKjT+FM=";
};
location = "libs/tree-sitter-wing";
generate = true;
@@ -2560,12 +2593,12 @@
};
xml = buildGrammar {
language = "xml";
version = "0.0.0+rev=9deacbf";
version = "0.0.0+rev=a3bfa1a";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-xml";
rev = "9deacbfb79cb3527a0396255beb17e1bba3f2052";
hash = "sha256-3ryZXRgsBaNKBBHUhJ8ANHYunOUMzthMI7gw+6lnooQ=";
rev = "a3bfa1ae7e8400ab81a6358f5e8d2983f5dd0697";
hash = "sha256-01zkVlkLGAlMV4bKlxwypvMizQ13FSRSuiLZCSuJy3Q=";
};
location = "tree-sitter-xml";
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xml";
pkgs/applications/editors/vim/plugins/vim-plugin-names
+1 -1
View File
@@ -434,7 +434,7 @@ https://github.com/lvimuser/lsp-inlayhints.nvim/,HEAD,
https://github.com/Issafalcon/lsp-overloads.nvim/,main,
https://github.com/ahmedkhalf/lsp-rooter.nvim/,,
https://github.com/nvim-lua/lsp-status.nvim/,,
https://github.com/VonHeikemen/lsp-zero.nvim/,main,
https://github.com/VonHeikemen/lsp-zero.nvim/,v3.x,
https://github.com/nvim-lua/lsp_extensions.nvim/,,
https://git.sr.ht/~whynothugo/lsp_lines.nvim,,
https://github.com/ray-x/lsp_signature.nvim/,,
pkgs/applications/networking/instant-messengers/beeper/default.nix
+3 -3
View File
@@ -11,11 +11,11 @@
}:
let
pname = "beeper";
version = "3.83.13";
version = "3.85.17";
name = "${pname}-${version}";
src = fetchurl {
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.83.13-build-231024j9x7ova5e.AppImage";
hash = "sha256-ZuwPLYcVcjCCLdWSarY0oq0GUDiOrvNBgK/7ETb8OLg=";
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.85.17-build-231109zg8yl8v6s.AppImage";
hash = "sha256-sYdfN535Fg3Bm26XKQNyuTItV+1dT3W/2HGH51ncEM0=";
};
appimage = appimageTools.wrapType2 {
inherit version pname src;
pkgs/applications/networking/sniffers/kismet/default.nix
+3 -2
View File
@@ -27,11 +27,11 @@
stdenv.mkDerivation rec {
pname = "kismet";
version = "2022-08-R1";
version = "2023-07-R1";
src = fetchurl {
url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz";
hash = "sha256-IUnM6sVSZQhlP00C3PemlOPaPcAAojcqHuS/mYgnl4E=";
hash = "sha256-8IVI4mymX6HlZ7Heu+ocpNDnIGvduWpPY5yQFxhz6Pc=";
};
postPatch = ''
@@ -87,6 +87,7 @@ stdenv.mkDerivation rec {
];
configureFlags = [
"--disable-wifi-coconut" # Until https://github.com/kismetwireless/kismet/issues/478
] ++ lib.optionals (!withNetworkManager) [
"--disable-libnm"
] ++ lib.optionals (!withPython) [
pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch
-10
View File
@@ -1,10 +0,0 @@
diff --git a/scripts/makedbh b/scripts/makedbh
index 01e4fa5..d6299c6 100755
--- a/scripts/makedbh
+++ b/scripts/makedbh
@@ -1,4 +1,4 @@
-#!/bin/csh -f
+#!/usr/bin/env tcsh
#
# makes the "database.h" (1st argument, $1) file from "database.h.in"
# (2nd argument, $2), setting various mask operation definitions
pkgs/applications/science/electronics/magic-vlsi/default.nix
+2 -6
View File
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "magic-vlsi";
version = "8.3.277";
version = "8.3.446";
src = fetchurl {
url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz";
sha256 = "sha256-cS3KaIVwGN/mMfRKjJxzdY6DeNV7tw2fATIHrFBV0fY=";
sha256 = "sha256-Isg8KAHicfTIETTmYoGsCYWt4+sLWdR+pGLaxu11Fe4=";
};
nativeBuildInputs = [ python3 ];
@@ -46,10 +46,6 @@ stdenv.mkDerivation rec {
env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
patches = [
./0001-strip-bin-prefix.patch
];
meta = with lib; {
description = "VLSI layout tool written in Tcl";
homepage = "http://opencircuitdesign.com/magic/";
pkgs/build-support/fetchgit/nix-prefetch-git
+5 -5
View File
@@ -261,14 +261,14 @@ make_deterministic_repo(){
# Remove files that contain timestamps or otherwise have non-deterministic
# properties.
if [ -f .git ]; then
local dotgit_content=$(<.git)
local dotgit_dir="${dotgit_content#gitdir: }"
local dotgit_content=$(<.git)
local dotgit_dir="${dotgit_content#gitdir: }"
else
local dotgit_dir=".git"
local dotgit_dir=".git"
fi
pushd "$dotgit_dir"
pushd "$dotgit_dir" >/dev/null
rm -rf logs/ hooks/ index FETCH_HEAD ORIG_HEAD refs/remotes/origin/HEAD config
popd
popd >/dev/null
# Remove all remote branches.
git branch -r | while read -r branch; do
clean_git branch -rD "$branch"
pkgs/by-name/co/codeium/package.nix
+5 -5
View File
@@ -13,10 +13,10 @@ let
}.${system} or throwSystem;
hash = {
x86_64-linux = "sha256-9EGoJ5DoGgVfbhCDeTvn1D7misJEj9jPwuiOK7z95Ts=";
aarch64-linux = "sha256-lO0YOSiO8AUrkbV+3Uyvg6p3bdAcTze3La2g5IcK1f0=";
x86_64-darwin = "sha256-WjvC3pt8Gd4q+BzrOhyGeYwZIbv2m5O3pSXe1N7Najw=";
aarch64-darwin = "sha256-IRm5m/Jaf4pmAzx+MXwmHLejo6Gv2OL56R1IEr/NlZU=";
x86_64-linux = "sha256-6dbgmYyXOUuWGOFXcO9eEZVoRjRLWK906SJh27wZ+PY=";
aarch64-linux = "sha256-cO1+ZVXC25zO5msU6Nbp29vkkNFRQ2jKSxtCZw1H104=";
x86_64-darwin = "sha256-3KMSoFQz7kYinD4QbS82dIq6UDetfdky6ClIfP83ISg=";
aarch64-darwin = "sha256-bj8PVJ4pfrNXo1yn5UbkHflskZMS61+LM9hi9mtdXtk=";
}.${system} or throwSystem;
bin = "$out/bin/codeium_language_server";
@@ -24,7 +24,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "codeium";
version = "1.2.104";
version = "1.4.16";
src = fetchurl {
name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";
pkgs/by-name/nu/numbat/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "numbat";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "numbat";
rev = "v${version}";
hash = "sha256-KX/V1cVZoPtkP/ehnvcTeaQavHlHP6NJ7g+FbOaYKC4=";
hash = "sha256-mwDpdQEIgvdGbcXEtA3TLP1e2yFNRCdcljaOzDEoKjg=";
};
cargoHash = "sha256-skCvIMz50GqveyawVHicpEqMknvZuYNvp1u+gW4wG8A=";
cargoHash = "sha256-hGNfB82m2w9wDiPs8PMUExWOBN9ZQ+XVs1v8jhHuVhA=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
pkgs/by-name/ra/raft-cowsql/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "raft-cowsql";
version = "0.17.7";
version = "0.18.2";
src = fetchFromGitHub {
owner = "cowsql";
repo = "raft";
rev = "refs/tags/v${version}";
hash = "sha256-ZAUC2o0VWpC/zMOVOAxW+CAdiDTXa5JG0gfHirTjm88=";
hash = "sha256-CMcKXX2u+qiroleg5GIovTOVAg9ycXBsRDqfsOCL3yo=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
pkgs/data/fonts/commit-mono/default.nix
+2 -2
View File
@@ -4,11 +4,11 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "commit-mono";
version = "1.139";
version = "1.141";
src = fetchzip {
url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/v${version}/CommitMono-${version}.zip";
hash = "sha256-TrXuWQzNlJsFwwOsnLuCCEj/9B9XrTNHSDVES68gIYs=";
hash = "sha256-ErC4ZM17rYq+5FRW9m9nIbQOjQGTCCoNhXHxb7Swd84=";
stripRoot = false;
};
pkgs/data/fonts/corefonts/default.nix
+13 -6
View File
@@ -39,9 +39,11 @@ stdenv.mkDerivation {
cabextract --lowercase viewer1.cab
# rename to more standard names
# handle broken macOS file-system
mv andalemo.ttf Andale_Mono.ttf
mv ariblk.ttf Arial_Black.ttf
mv arial.ttf Arial.ttf
mv arial.ttf Arial.ttf.tmp
mv Arial.ttf.tmp Arial.ttf
mv arialbd.ttf Arial_Bold.ttf
mv arialbi.ttf Arial_Bold_Italic.ttf
mv ariali.ttf Arial_Italic.ttf
@@ -51,12 +53,15 @@ stdenv.mkDerivation {
mv courbd.ttf Courier_New_Bold.ttf
mv couri.ttf Courier_New_Italic.ttf
mv courbi.ttf Courier_New_Bold_Italic.ttf
mv georgia.ttf Georgia.ttf
mv georgia.ttf Georgia.ttf.tmp
mv Georgia.ttf.tmp Georgia.ttf
mv georgiab.ttf Georgia_Bold.ttf
mv georgiai.ttf Georgia_Italic.ttf
mv georgiaz.ttf Georgia_Bold_Italic.ttf
mv impact.ttf Impact.ttf
mv tahoma.ttf Tahoma.ttf
mv impact.ttf Impact.ttf.tmp
mv Impact.ttf.tmp Impact.ttf
mv tahoma.ttf Tahoma.ttf.tmp
mv Tahoma.ttf.tmp Tahoma.ttf
mv times.ttf Times_New_Roman.ttf
mv timesbd.ttf Times_New_Roman_Bold.ttf
mv timesbi.ttf Times_New_Roman_Bold_Italic.ttf
@@ -65,11 +70,13 @@ stdenv.mkDerivation {
mv trebucbd.ttf Trebuchet_MS_Bold.ttf
mv trebucit.ttf Trebuchet_MS_Italic.ttf
mv trebucbi.ttf Trebuchet_MS_Italic.ttf
mv verdana.ttf Verdana.ttf
mv verdana.ttf Verdana.ttf.tmp
mv Verdana.ttf.tmp Verdana.ttf
mv verdanab.ttf Verdana_Bold.ttf
mv verdanai.ttf Verdana_Italic.ttf
mv verdanaz.ttf Verdana_Bold_Italic.ttf
mv webdings.ttf Webdings.ttf
mv webdings.ttf Webdings.ttf.tmp
mv Webdings.ttf.tmp Webdings.ttf
install -m444 -Dt $out/share/fonts/truetype *.ttf
pkgs/development/libraries/raylib/default.nix
+30 -12
View File
@@ -1,13 +1,28 @@
{ stdenv, lib, fetchFromGitHub, cmake, fetchpatch
, mesa, libGLU, glfw
, libX11, libXi, libXcursor, libXrandr, libXinerama
, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib
, pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio
{ stdenv
, lib
, fetchFromGitHub
, cmake
, fetchpatch
, mesa
, libGLU
, glfw
, libX11
, libXi
, libXcursor
, libXrandr
, libXinerama
, alsaSupport ? stdenv.hostPlatform.isLinux
, alsa-lib
, pulseSupport ? stdenv.hostPlatform.isLinux
, libpulseaudio
, sharedLib ? true
, includeEverything ? true
, raylib-games
, darwin
}:
let
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL;
in
stdenv.mkDerivation (finalAttrs: {
pname = "raylib";
version = "4.5.0";
@@ -21,11 +36,14 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
buildInputs = [
mesa glfw libXi libXcursor libXrandr libXinerama
] ++ lib.optional alsaSupport alsa-lib
buildInputs = [ glfw ]
++ lib.optionals stdenv.isLinux [ mesa libXi libXcursor libXrandr libXinerama ]
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]
++ lib.optional alsaSupport alsa-lib
++ lib.optional pulseSupport libpulseaudio;
propagatedBuildInputs = [ libGLU libX11 ];
propagatedBuildInputs = lib.optionals stdenv.isLinux [ libGLU libX11 ]
++ lib.optionals stdenv.isDarwin [ OpenGL ];
# https://github.com/raysan5/raylib/wiki/CMake-Build-Options
cmakeFlags = [
@@ -33,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
"-DBUILD_EXAMPLES=OFF"
"-DCUSTOMIZE_BUILD=1"
] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON"
++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON";
++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON";
passthru.tests = [ raylib-games ];
@@ -57,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://www.raylib.com/";
license = licenses.zlib;
maintainers = with maintainers; [ adamlwgriffiths ];
platforms = platforms.linux;
platforms = platforms.all;
changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG";
};
})
pkgs/development/python-modules/aiocomelit/default.nix
+4 -2
View File
@@ -1,6 +1,7 @@
{ lib
, aiohttp
, buildPythonPackage
, colorlog
, fetchFromGitHub
, pint
, poetry-core
@@ -10,7 +11,7 @@
buildPythonPackage rec {
pname = "aiocomelit";
version = "0.3.1";
version = "0.5.0";
format = "pyproject";
disabled = pythonOlder "3.10";
@@ -19,7 +20,7 @@ buildPythonPackage rec {
owner = "chemelli74";
repo = "aiocomelit";
rev = "refs/tags/v${version}";
hash = "sha256-/nixEjCQED1R2Z+iNs+bvxa6T+bPJ0b5Hn5vMO+v46Y=";
hash = "sha256-2wdgG22/Cln5uWQoT3Fs9tOLgB1X8J6AEqxV5R+lqno=";
};
postPatch = ''
@@ -37,6 +38,7 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
colorlog
pytestCheckHook
];
pkgs/development/python-modules/dbus-fast/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "dbus-fast";
version = "2.13.1";
version = "2.14.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ay/NaJ/u/XG9XQ7C2dzmJKs/j1s/vDHUnaE/qDhho9Q=";
hash = "sha256-IT18r7LKOVuiCuE/QzW6X/jkr5EK8sSR038i4LR1bcs=";
};
# The project can build both an optimized cython version and an unoptimized
pkgs/development/python-modules/evohome-async/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "evohome-async";
version = "0.4.8";
version = "0.4.9";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "zxdavb";
repo = "evohome-async";
rev = "refs/tags/${version}";
hash = "sha256-0qVbHZ8ADyZDb4wLqEb7zgl3MHZz+8DSLGCMGlt0+eE=";
hash = "sha256-4AhxvUkLiej7OSj9Y19tJnVCzNlC5PF6KB5zTHN8gLA=";
};
nativeBuildInputs = [
pkgs/development/python-modules/magic-wormhole/default.nix
+3 -1
View File
@@ -24,6 +24,7 @@
# tests
, nettools
, unixtools
, mock
, magic-wormhole-transit-relay
, magic-wormhole-mailbox-server
@@ -72,7 +73,8 @@ buildPythonPackage rec {
magic-wormhole-mailbox-server
pytestCheckHook
]
++ passthru.optional-dependencies.dilation;
++ passthru.optional-dependencies.dilation
++ lib.optionals stdenv.isDarwin [ unixtools.locale ];
disabledTests = lib.optionals stdenv.isDarwin [
# These tests doesn't work within Darwin's sandbox
pkgs/development/python-modules/niaarm/default.nix
+8 -3
View File
@@ -3,24 +3,26 @@
, fetchFromGitHub
, niapy
, nltk
, numpy
, pandas
, poetry-core
, pytestCheckHook
, pythonOlder
, tomli
}:
buildPythonPackage rec {
pname = "niaarm";
version = "0.3.3";
version = "0.3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "firefly-cpp";
repo = "NiaARM";
rev = "refs/tags/${version}";
hash = "sha256-kWOJfADqtC8YdZUlifKeiaS2a2cgcsMgCf0IHJt4NKY=";
hash = "sha256-E5G1uVDSErqwxTBNQ7qselemW9A3W8sr3ExPEh+1les=";
};
nativeBuildInputs = [
@@ -30,7 +32,10 @@ buildPythonPackage rec {
propagatedBuildInputs = [
niapy
nltk
numpy
pandas
] ++ lib.optionals (pythonOlder "3.11") [
tomli
];
disabledTests = [
pkgs/development/python-modules/pyvisa-py/default.nix
+19 -9
View File
@@ -1,47 +1,57 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, setuptools
, setuptools-scm
, gpib-ctypes
, pyserial
, pyusb
, pyvisa
, typing-extensions
, psutil
, zeroconf
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyvisa-py";
version = "0.7.0";
format = "setuptools";
version = "0.7.1";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "pyvisa";
repo = "pyvisa-py";
rev = "refs/tags/${version}";
hash = "sha256-wMDO0CUCSSCB8cXvTmIEWD8OGMZRZNhmmRx+fZnK288=";
hash = "sha256-zsa4TGDvvPAogOC0ljXC9uwWC9mteldUYprLmwrXNMQ=";
};
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
pyserial
pyusb
pyvisa
typing-extensions
];
passthru.optional-dependencies = {
gpib-ctypes = [ gpib-ctypes ];
serial = [ pyserial ];
usb = [ pyusb ];
psutil = [ psutil ];
hislip-discovery = [ zeroconf ];
# vicp = [ pyvicp zeroconf ];
};
nativeCheckInputs = [
pytestCheckHook
];
postConfigure = ''
export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}"
'';
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
meta = with lib; {
description = "Module that implements the Virtual Instrument Software Architecture";
pkgs/development/python-modules/qcengine/default.nix
+2 -2
View File
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "qcengine";
version = "0.28.1";
version = "0.29.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ebZayF5VGHXjBFO3k2KegCNqAFygB3BXKvdvr8mF/Ss=";
hash = "sha256-cIfX9MpRMXtBfLKHKTzCLkv31fBIyanTQHEs8hHk7aQ=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/sorl_thumbnail/default.nix → pkgs/development/python-modules/sorl-thumbnail/default.nix
+24 -6
View File
@@ -1,28 +1,46 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy27
, pythonOlder
, setuptools
, setuptools-scm
, django
}:
buildPythonPackage rec {
pname = "sorl-thumbnail";
version = "12.9.0";
disabled = isPy27;
version = "12.10.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-DLwvUhUufyJm48LLSuXYOv0ulv1eHELlZnNiuqo9LbM=";
hash = "sha256-3pWkkhf9/s7SIvo86qAdMS7i+KrVa6NNbHDy3umoSTg=";
};
nativeBuildInputs = [ setuptools-scm ];
nativeBuildInputs = [
setuptools
setuptools-scm
];
buildInputs = [
django
];
env.DJANGO_SETTINGS_MODULE = "sorl.thumbnail.conf.defaults";
# Disabled due to an improper configuration error when tested against django. This looks like something broken in the test cases for sorl.
doCheck = false;
pythonImportsCheck = [
"sorl.thumbnail"
];
meta = with lib; {
homepage = "https://sorl-thumbnail.readthedocs.org/en/latest/";
description = "Thumbnails for Django";
changelog = "https://github.com/jazzband/sorl-thumbnail/blob/${version}/CHANGES.rst";
license = licenses.bsd3;
};
}
pkgs/development/python-modules/spacy-transformers/default.nix
+2 -2
View File
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "spacy-transformers";
version = "1.3.2";
version = "1.3.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-xfUePKLmR1Arhs0c1ZNjca6klJdGL0o2DdGLsejE6zw=";
hash = "sha256-Q8oV0mw8POFscFcdsYZfTkavNVQyqWdLAdb4lDX4ahM=";
};
nativeBuildInputs = [
pkgs/development/python-modules/sqlobject/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "sqlobject";
version = "3.10.3";
version = "3.11.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "SQLObject";
inherit version;
hash = "sha256-pbXO+gXgKD2ycuG6RirEnQnGmBJpUkorptBrS4b8FS4=";
hash = "sha256-QrGyrM6e1cxCtF4GxoivXU/Gj2H8VnG7EFcgimLfdng=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/stripe/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "stripe";
version = "6.5.0";
version = "7.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-9fTHare5AfJjHvd3QdBpMg8zKMHjGRjax+20qgSssP0=";
hash = "sha256-Pcfdgjk20yYt1DCr5XQ4rzLokQNS27NOspa/21nvCuw=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/tableauserverclient/default.nix
+26 -12
View File
@@ -1,35 +1,49 @@
{ lib
, buildPythonPackage
, python
, fetchPypi
, defusedxml
, requests
, packaging
, requests-mock
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "tableauserverclient";
version = "0.26";
version = "0.28";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-vn7A7n0Z4kTtrm8MEoUJiv94K3qA/4Kx8lElhDM/LlI=";
hash = "sha256-jSblDVkuuBBZ7GmPKUYji8wtRoPS7g8r6Ye9EpnjvKA=";
};
propagatedBuildInputs = [ defusedxml requests packaging ];
propagatedBuildInputs = [
defusedxml
requests
packaging
];
checkInputs = [ requests-mock ];
nativeCheckInputs = [
requests-mock
pytestCheckHook
];
nativeCheckInputs = [ pytestCheckHook ];
# Tests attempt to create some file artifacts and fails
doCheck = false;
doCheck = false; # it attempts to create some file artifacts and fails
pythonImportsCheck = [
"tableauserverclient"
];
meta = {
description = "A Python module for working with the Tableau Server REST API.";
homepage = "https://pypi.org/project/tableauserverclient/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ];
meta = with lib; {
description = "Module for working with the Tableau Server REST API";
homepage = "https://github.com/tableau/server-client-python";
changelog = "https://github.com/tableau/server-client-python/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}
pkgs/development/python-modules/teslajsonpy/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "teslajsonpy";
version = "3.9.6";
version = "3.9.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "zabuldon";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-CMgqZePM67IejwYy+x6vfFSPpAA5NRUp5KRD1lEq7io=";
hash = "sha256-A59b7qr9Y4LuIwP51ci7k1019/T+qNcDYPDNCkmqpi4=";
};
nativeBuildInputs = [
pkgs/development/python-modules/textual/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "textual";
version = "0.40.0";
version = "0.41.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "Textualize";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-+3bxc0ryHtbEJkB+EqjJhW+yWJWxMkxlSav4v6D3/gw=";
hash = "sha256-K3JpAVkw6njUT2AGGLL3ACagPK0K6Ny4PvCsbmuNvTo=";
};
nativeBuildInputs = [
pkgs/development/python-modules/troposphere/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "troposphere";
version = "4.4.1";
version = "4.5.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "cloudtools";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ecRpp8XsP/iv4G8m85qcGJXHXH4CPdgBO8c0IZU56wU=";
hash = "sha256-LLky4lSSMUmLEf+qHwgPvDu0DZhG4WWZ1aFSXqFm1BA=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/types-aiobotocore/default.nix
+2 -2
View File
@@ -364,12 +364,12 @@
buildPythonPackage rec {
pname = "types-aiobotocore";
version = "2.6.0";
version = "2.7.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-GF3YDuyhnEx0JpOxU/tRAnFu+98p0TF5NCU1CXnR2bE=";
hash = "sha256-JVtG3t6rkZ5nrttMlryqdcU35DSblNe3MfvlqLqHJp0=";
};
nativeBuildInputs = [
pkgs/development/python-modules/types-awscrt/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "types-awscrt";
version = "0.19.9";
version = "0.19.10";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "types_awscrt";
inherit version;
hash = "sha256-vVno8ql7e9N0Xj+GALDtgAZBRrN1NxVcUIJuKNJIZDA=";
hash = "sha256-YowjnLt7eCBzBfklBOEEDRClp/ToA3KLi+xuftUoti4=";
};
nativeBuildInputs = [
pkgs/development/python-modules/types-pillow/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "types-pillow";
version = "10.0.0.3";
version = "10.1.0.2";
format = "setuptools";
src = fetchPypi {
inherit version;
pname = "types-Pillow";
hash = "sha256-rgyHfTY9o0m7uCxUY8nngDcpDMB9NxTLDOr10vf1yCU=";
hash = "sha256-UlwcXuZ7CsFyHEDSvGGCJu8hI8NH5SfhTgW5IHIaE7k=";
};
# Modules doesn't have tests
pkgs/development/python-modules/types-protobuf/default.nix
+2 -2
View File
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-protobuf";
version = "4.24.0.2";
version = "4.24.0.4";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-WYuyKQubDqZfT2NWmgneqkR17de7DYWJBXo43rCxn08=";
hash = "sha256-V6tCyxcd/bosdLtbUMJQR4U4zDxe2VuLNokprQyfkKU=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/types-pyopenssl/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "types-pyopenssl";
version = "23.2.0.2";
version = "23.3.0.0";
format = "setuptools";
src = fetchPypi {
pname = "types-pyOpenSSL";
inherit version;
hash = "sha256-agENrJ7NQrWC190sw+nkBIa3mztkuy//uhR0/5avkG0=";
hash = "sha256-X/sHf+cLaZyI1cqrmZroDhkv4ov2zaeYm355seTi3NM=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/types-redis/default.nix
+2 -2
View File
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "types-redis";
version = "4.6.0.7";
version = "4.6.0.10";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-KMQVPdtcnU8Q3vRKJFRnPDYdLV/DzYZ887sVIPP1mjg=";
hash = "sha256-qn+190NTRQDydN3xGrHJEKrhAgSBhlo2t5nh1n3iqvM=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/weaviate-client/default.nix
+2 -2
View File
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "weaviate-client";
version = "3.24.1";
version = "3.25.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-4HM1DCG9TcpcDqxd1dlftHQnjHFaryBB44LYa7dRisg=";
hash = "sha256-iU33APwfCpMvo3ACn2RK9AYvhxgCb9pa0HZH01fZUWc=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
pkgs/development/python-modules/zope-dottedname/default.nix
+49
View File
@@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, setuptools
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "zope-dottedname";
version = "6.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "zope.dottedname";
inherit version;
hash = "sha256-28S4W/vzSx74jasWJSrG7xbZBDnyIjstCiYs9Bnq6QI=";
};
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [
pytestCheckHook
];
pytestFlagsArray = [
"src/zope/dottedname/tests.py"
];
pythonImportsCheck = [
"zope.dottedname"
];
pythonNamespaces = [
"zope"
];
meta = with lib; {
homepage = "https://github.com/zopefoundation/zope.dottedname";
description = "Resolver for Python dotted names";
changelog = "https://github.com/zopefoundation/zope.dottedname/blob/${version}/CHANGES.rst";
license = licenses.zpl21;
maintainers = with maintainers; [ goibhniu ];
};
}
pkgs/development/python-modules/zope_dottedname/default.nix
-22
View File
@@ -1,22 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "zope.dottedname";
version = "5.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-mfWDqAKFhqtMIXlGE+QR0BDNCZF/RdqXa9/udI87++w=";
};
meta = with lib; {
homepage = "http://pypi.python.org/pypi/zope.dottedname";
description = "Resolver for Python dotted names";
license = licenses.zpl20;
maintainers = with maintainers; [ goibhniu ];
};
}
pkgs/development/quickemu/default.nix
+2 -11
View File
@@ -25,7 +25,6 @@
, quickemu
, testers
, installShellFiles
, fetchpatch
}:
let
runtimePaths = [
@@ -51,23 +50,15 @@ in
stdenv.mkDerivation rec {
pname = "quickemu";
version = "4.9";
version = "4.9.1";
src = fetchFromGitHub {
owner = "quickemu-project";
repo = "quickemu";
rev = version;
hash = "sha256-ZCHGZb4mdtnNfFBcSqZJRW7fmkTBrWrVko3iwEhO1RY=";
hash = "sha256-tWl16dd0a6pDz+cUZx9Ku2ov+LJZabR2cDso5tPbML4=";
};
patches = [
# https://github.com/quickemu-project/quickemu/pull/815
(fetchpatch {
url = "https://github.com/quickemu-project/quickemu/commit/2b9d95a746fd85be0cea48e5544b18dc3ae18d27.patch";
hash = "sha256-fTJEd3o7LznT1mGwfxXWlW8XM1BmIeId+j8pGjIfIcE=";
})
];
postPatch = ''
sed -i \
-e '/OVMF_CODE_4M.secboot.fd/s|ovmfs=(|ovmfs=("${OVMFFull.fd}/FV/OVMF_CODE.fd","${OVMFFull.fd}/FV/OVMF_VARS.fd" |' \
pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
+18 -6
View File
@@ -22,6 +22,7 @@
, file
, substituteAll
, writeTextFile
, writeShellApplication
}:
let
@@ -128,6 +129,17 @@ let
defaultShellPath = lib.makeBinPath defaultShellUtils;
bashWithDefaultShellUtils = writeShellApplication {
name = "bash";
runtimeInputs = defaultShellUtils;
text = ''
if [[ "$PATH" == "/no-such-path" ]]; then
export PATH=${defaultShellPath}
fi
exec ${bash}/bin/bash "$@"
'';
};
platforms = lib.platforms.linux ++ lib.platforms.darwin;
system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux";
@@ -420,8 +432,8 @@ stdenv.mkDerivation rec {
# If you add more replacements here, you must change the grep above!
# Only files containing /bin are taken into account.
substituteInPlace "$path" \
--replace /bin/bash ${bash}/bin/bash \
--replace "/usr/bin/env bash" ${bash}/bin/bash \
--replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash \
--replace "/usr/bin/env bash" ${bashWithDefaultShellUtils}/bin/bash \
--replace "/usr/bin/env python" ${python3}/bin/python \
--replace /usr/bin/env ${coreutils}/bin/env \
--replace /bin/true ${coreutils}/bin/true
@@ -436,17 +448,17 @@ stdenv.mkDerivation rec {
# bazel test runner include references to /bin/bash
substituteInPlace tools/build_rules/test_rules.bzl \
--replace /bin/bash ${bash}/bin/bash
--replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash
for i in $(find tools/cpp/ -type f)
do
substituteInPlace $i \
--replace /bin/bash ${bash}/bin/bash
--replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash
done
# Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
substituteInPlace scripts/bootstrap/compile.sh \
--replace /bin/bash ${bash}/bin/bash
--replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash
# add nix environment vars to .bazelrc
cat >> .bazelrc <<EOF
@@ -523,7 +535,7 @@ stdenv.mkDerivation rec {
in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches
+ genericPatches;
buildInputs = [buildJdk] ++ defaultShellUtils;
buildInputs = [buildJdk bashWithDefaultShellUtils] ++ defaultShellUtils;
# when a command can’t be found in a bazel build, you might also
# need to add it to `defaultShellPath`.
pkgs/games/raylib-games/default.nix
+6 -2
View File
@@ -1,5 +1,8 @@
{ lib, stdenv, fetchFromGitHub, raylib }:
{ lib, stdenv, fetchFromGitHub, raylib, darwin }:
let
inherit (darwin.apple_sdk.frameworks) Cocoa;
in
stdenv.mkDerivation rec {
pname = "raylib-games";
version = "2022-10-24";
@@ -11,7 +14,8 @@ stdenv.mkDerivation rec {
hash = "sha256-N9ip8yFUqXmNMKcvQuOyxDI4yF/w1YaoIh0prvS4Xr4=";
};
buildInputs = [ raylib ];
buildInputs = [ raylib ]
++ lib.optionals stdenv.isDarwin [ Cocoa ];
configurePhase = ''
runHook preConfigure
pkgs/os-specific/linux/linux-wifi-hotspot/default.nix
+2 -2
View File
@@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "linux-wifi-hotspot";
version = "4.5.0";
version = "4.6.0";
src = fetchFromGitHub {
owner = "lakinduakash";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cCVJPEAZZzOGCf45oo1J7wWtYn/IJfcASHnKR+R0Ge4=";
sha256 = "sha256-u9OdSpdxnjHOrK6PP/SFvGRtezssoZSoJFGVdRbOIPU=";
};
nativeBuildInputs = [
pkgs/servers/readarr/default.nix
+4 -4
View File
@@ -8,13 +8,13 @@ let
x86_64-darwin = "x64";
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
x64-linux_hash = "sha256-1EdDMSlC6hh1iNmra63DTLG6TAkmpZ/lIjvdfLJuC74=";
arm64-linux_hash = "sha256-CZj/zg6SkHmpiIbEIpxYMtlSLsDTFLBJYqr2pUpSu94=";
x64-osx_hash = "sha256-NRMbHLffx093gEb24I/fdp2fYioDehQ5gBMpZciX+ts=";
x64-linux_hash = "sha256-XWKslumO6o0kn9JMFTTuDTDALX6r4rzEyFFj2w13cYc=";
arm64-linux_hash = "sha256-rsgyTgSW1w/zrXbOvwbJ8KTRK6HheKpACoR3Tjw5z+k=";
x64-osx_hash = "sha256-tJkYWvJfxF2zMl1TEG5qhoV2qKya0bzIitNVIaeRLSI=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "readarr";
version = "0.3.8.2267";
version = "0.3.10.2287";
src = fetchurl {
url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz";
pkgs/servers/redpanda/default.nix
+3 -3
View File
@@ -7,12 +7,12 @@
, stdenv
}:
let
version = "23.2.12";
version = "23.2.14";
src = fetchFromGitHub {
owner = "redpanda-data";
repo = "redpanda";
rev = "v${version}";
sha256 = "sha256-Sg41XXn/L1YglD2ryEC4AT70rv0hjZtTCf7O1Lwmqwo=";
sha256 = "sha256-VvbyVAcNPe1UOEfX+HSY4OaOBS78YZuFgpIYo2s1kXo=";
};
server = callPackage ./server.nix { inherit src version; };
in
@@ -21,7 +21,7 @@ buildGoModule rec {
inherit doCheck src version;
modRoot = "./src/go/rpk";
runVend = false;
vendorHash = "sha256-DNtkva6t3Arja6I20rgyw7Ty1OX32nkDMOABPwu2GIQ=";
vendorHash = "sha256-mLMMw48d1FOvIIjDNza0rZSWP55lP1AItR/hT3lYXDg=";
ldflags = [
''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''
pkgs/servers/sqlpage/default.nix
+21 -21
View File
@@ -11,64 +11,64 @@
let
apexcharts = fetchurl {
url = "https://cdn.jsdelivr.net/npm/apexcharts@3.41.0/dist/apexcharts.min.js";
sha256 = "sha256-JvfrbG0Jkj1XzwMu28wweq4DTzHgRAQHmC5f0stdU5Q=";
url = "https://cdn.jsdelivr.net/npm/apexcharts@3.43.2-0/dist/apexcharts.min.js";
sha256 = "sha256-7al9VaQHu7u5jfx1HZf+T8k27kbIhgHvRwaeIeYEjVI=";
};
tablerCss = fetchurl {
url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler.min.css";
sha256 = "sha256-vvqPe3OoUsri+/z6/s3a9LZ/u0tM07VNmVWopaXS3Uk=";
url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css";
sha256 = "sha256-lS3nKxMMZiKIRJG7UgUonOHYuvHgW5eckEjvHMYxb9Q=";
};
tablerVendorsCss = fetchurl {
url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler-vendors.min.css";
sha256 = "sha256-Pxz9YzwGJIUlHDNZMU9h7Lz/7qA/t0ehlRfC1P8wzxE=";
url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler-vendors.min.css";
sha256 = "sha256-Aa7AUOaz6hJLiUzQStZTy2VPOZyg0ViSo2MCzpDU1tY=";
};
tablerJs = fetchurl {
url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/js/tabler.min.js";
sha256 = "sha256-xnY4FSLoAEy0TVjo/xv488tAXOrI+hvXGvEVVQdMDk8=";
url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/js/tabler.min.js";
sha256 = "sha256-ygO5OTRUtYxDDkERRwBCfq+fmakhM6ybwfl6gCCPlAQ=";
};
listJsFixed = fetchurl {
url = "https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.2/dist/list.min.js";
sha256 = "sha256-mwE8YX5fgYlI9M7zCNDlPxT7pb7NJPkOyo1Y+4At85s=";
url = "https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js";
sha256 = "sha256-sYy7qNJW7RTuaNA0jq6Yrtfs57ypYrItZ3f8T7kqfPM=";
};
tablerIcons = fetchurl {
url = "https://cdn.jsdelivr.net/npm/@tabler/icons@2.30.0/tabler-sprite.svg";
sha256 = "sha256-xRHWlHNQraZpiRlgVswkfgN1qMrjQOtRYAq1N/DccgQ=";
url = "https://cdn.jsdelivr.net/npm/@tabler/icons@2.39.0/tabler-sprite.svg";
sha256 = "sha256-8C9PPhDyVnym0q/RkQlTyfjKbAMRsYBlRtsMbNAepvY=";
};
in
rustPlatform.buildRustPackage rec {
pname = "sqlpage";
version = "0.9.5";
version = "0.15.1";
src = fetchFromGitHub {
owner = "lovasoa";
repo = "SQLpage";
rev = "v${version}";
hash = "sha256-6KJ3phhOf10S0EMdolUw3sdXm1G7yuF+Ii/AjdgBE+s=";
hash = "sha256-0CPWMVdX0HGPMfIiDfC6TJ2t07O6eZcS7yEDVAvjLUc=";
};
postPatch = ''
substituteInPlace sqlpage/apexcharts.js \
--replace '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.41.0/dist/apexcharts.min.js */' \
--replace '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.43.2-0/dist/apexcharts.min.js */' \
"$(cat ${apexcharts})"
substituteInPlace sqlpage/sqlpage.css \
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler.min.css */' \
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css */' \
"$(cat ${tablerCss})"
substituteInPlace sqlpage/sqlpage.css \
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler-vendors.min.css */' \
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler-vendors.min.css */' \
"$(cat ${tablerVendorsCss})"
substituteInPlace sqlpage/sqlpage.js \
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/js/tabler.min.js */' \
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/js/tabler.min.js */' \
"$(cat ${tablerJs})"
substituteInPlace sqlpage/sqlpage.js \
--replace '/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.2/dist/list.min.js */' \
--replace '/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js */' \
"$(cat ${listJsFixed})"
substituteInPlace sqlpage/tabler-icons.svg \
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons@2.30.0/tabler-sprite.svg */' \
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons@2.39.0/tabler-sprite.svg */' \
"$(cat ${tablerIcons})"
'';
cargoHash = "sha256-kJzBvZSh6jkSJ4um+KYp7fKklDPlvOgz5NQb7j99brw=";
cargoHash = "sha256-ooK4eIaPbUsxgDuVJkWHlArMa81TtlRfR6YYEAh7cLY=";
nativeBuildInputs = [
pkg-config
pkgs/stdenv/generic/make-derivation.nix
+119 -82
View File
@@ -3,6 +3,43 @@
stdenv:
let
# Lib attributes are inherited to the lexical scope for performance reasons.
inherit (lib)
any
assertMsg
attrNames
boolToString
chooseDevOutputs
concatLists
concatMap
concatMapStrings
concatStringsSep
elem
elemAt
extendDerivation
filter
findFirst
flip
head
imap1
isAttrs
isBool
isDerivation
isInt
isList
isString
mapAttrs
mapNullable
optional
optionalAttrs
optionalString
optionals
remove
splitString
subtractLists
unique
;
checkMeta = import ./check-meta.nix {
inherit lib config;
# Nix itself uses the `system` field of a derivation to decide where
@@ -115,7 +152,7 @@ let
# Including it then would cause needless mass rebuilds.
#
# TODO(@Ericson2314): Make [ "build" "host" ] always the default / resolve #87909
configurePlatforms ? lib.optionals
configurePlatforms ? optionals
(stdenv.hostPlatform != stdenv.buildPlatform || config.configurePlatformsByDefault)
[ "build" "host" ]
@@ -168,7 +205,7 @@ let
# Policy on acceptable hash types in nixpkgs
assert attrs ? outputHash -> (
let algo =
attrs.outputHashAlgo or (lib.head (lib.splitString "-" attrs.outputHash));
attrs.outputHashAlgo or (head (splitString "-" attrs.outputHash));
in
if algo == "md5" then
throw "Rejected insecure ${algo} hash '${attrs.outputHash}'"
@@ -183,12 +220,12 @@ let
doInstallCheck' = doInstallCheck && stdenv.buildPlatform.canExecute stdenv.hostPlatform;
separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux;
outputs' = outputs ++ lib.optional separateDebugInfo' "debug";
outputs' = outputs ++ optional separateDebugInfo' "debug";
# Turn a derivation into its outPath without a string context attached.
# See the comment at the usage site.
unsafeDerivationToUntrackedOutpath = drv:
if lib.isDerivation drv
if isDerivation drv
then builtins.unsafeDiscardStringContext drv.outPath
else drv;
@@ -198,9 +235,9 @@ let
++ depsTargetTarget ++ depsTargetTargetPropagated) == 0;
dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || !stdenv.hasCC;
hardeningDisable' = if lib.any (x: x == "fortify") hardeningDisable
hardeningDisable' = if any (x: x == "fortify") hardeningDisable
# disabling fortify implies fortify3 should also be disabled
then lib.unique (hardeningDisable ++ [ "fortify3" ])
then unique (hardeningDisable ++ [ "fortify3" ])
else hardeningDisable;
supportedHardeningFlags = [ "fortify" "fortify3" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ];
# Musl-based platforms will keep "pie", other platforms will not.
@@ -212,19 +249,19 @@ let
# - static armv7l, where compilation fails.
!(stdenv.hostPlatform.isAarch && stdenv.hostPlatform.isStatic)
then supportedHardeningFlags
else lib.remove "pie" supportedHardeningFlags;
else remove "pie" supportedHardeningFlags;
enabledHardeningOptions =
if builtins.elem "all" hardeningDisable'
then []
else lib.subtractLists hardeningDisable' (defaultHardeningFlags ++ hardeningEnable);
else subtractLists hardeningDisable' (defaultHardeningFlags ++ hardeningEnable);
# hardeningDisable additionally supports "all".
erroneousHardeningFlags = lib.subtractLists supportedHardeningFlags (hardeningEnable ++ lib.remove "all" hardeningDisable);
erroneousHardeningFlags = subtractLists supportedHardeningFlags (hardeningEnable ++ remove "all" hardeningDisable);
checkDependencyList = checkDependencyList' [];
checkDependencyList' = positions: name: deps: lib.flip lib.imap1 deps (index: dep:
if lib.isDerivation dep || dep == null || builtins.isString dep || builtins.isPath dep then dep
else if lib.isList dep then checkDependencyList' ([index] ++ positions) name dep
else throw "Dependency is not of a valid type: ${lib.concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}");
checkDependencyList' = positions: name: deps: flip imap1 deps (index: dep:
if isDerivation dep || dep == null || builtins.isString dep || builtins.isPath dep then dep
else if isList dep then checkDependencyList' ([index] ++ positions) name dep
else throw "Dependency is not of a valid type: ${concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}");
in if builtins.length erroneousHardeningFlags != 0
then abort ("mkDerivation was called with unsupported hardening flags: " + lib.generators.toPretty {} {
inherit erroneousHardeningFlags hardeningDisable hardeningEnable supportedHardeningFlags;
@@ -233,20 +270,20 @@ else let
doCheck = doCheck';
doInstallCheck = doInstallCheck';
buildInputs' = buildInputs
++ lib.optionals doCheck checkInputs
++ lib.optionals doInstallCheck installCheckInputs;
++ optionals doCheck checkInputs
++ optionals doInstallCheck installCheckInputs;
nativeBuildInputs' = nativeBuildInputs
++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh
++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh
++ lib.optionals doCheck nativeCheckInputs
++ lib.optionals doInstallCheck nativeInstallCheckInputs;
++ optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh
++ optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh
++ optionals doCheck nativeCheckInputs
++ optionals doInstallCheck nativeInstallCheckInputs;
outputs = outputs';
references = nativeBuildInputs ++ buildInputs
++ propagatedNativeBuildInputs ++ propagatedBuildInputs;
dependencies = map (map lib.chooseDevOutputs) [
dependencies = map (map chooseDevOutputs) [
[
(map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuild" depsBuildBuild))
(map (drv: drv.__spliced.buildHost or drv) (checkDependencyList "nativeBuildInputs" nativeBuildInputs'))
@@ -260,7 +297,7 @@ else let
(map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTarget" depsTargetTarget))
]
];
propagatedDependencies = map (map lib.chooseDevOutputs) [
propagatedDependencies = map (map chooseDevOutputs) [
[
(map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuildPropagated" depsBuildBuildPropagated))
(map (drv: drv.__spliced.buildHost or drv) (checkDependencyList "propagatedNativeBuildInputs" propagatedNativeBuildInputs))
@@ -276,26 +313,26 @@ else let
];
computedSandboxProfile =
lib.concatMap (input: input.__propagatedSandboxProfile or [])
concatMap (input: input.__propagatedSandboxProfile or [])
(stdenv.extraNativeBuildInputs
++ stdenv.extraBuildInputs
++ lib.concatLists dependencies);
++ concatLists dependencies);
computedPropagatedSandboxProfile =
lib.concatMap (input: input.__propagatedSandboxProfile or [])
(lib.concatLists propagatedDependencies);
concatMap (input: input.__propagatedSandboxProfile or [])
(concatLists propagatedDependencies);
computedImpureHostDeps =
lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or [])
unique (concatMap (input: input.__propagatedImpureHostDeps or [])
(stdenv.extraNativeBuildInputs
++ stdenv.extraBuildInputs
++ lib.concatLists dependencies));
++ concatLists dependencies));
computedPropagatedImpureHostDeps =
lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or [])
(lib.concatLists propagatedDependencies));
unique (concatMap (input: input.__propagatedImpureHostDeps or [])
(concatLists propagatedDependencies));
envIsExportable = lib.isAttrs env && !lib.isDerivation env;
envIsExportable = isAttrs env && !isDerivation env;
derivationArg =
(removeAttrs attrs
@@ -306,8 +343,8 @@ else let
"__darwinAllowLocalNetworking"
"__impureHostDeps" "__propagatedImpureHostDeps"
"sandboxProfile" "propagatedSandboxProfile"]
++ lib.optional (__structuredAttrs || envIsExportable) "env"))
// (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) {
++ optional (__structuredAttrs || envIsExportable) "env"))
// (optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) {
name =
let
# Indicate the host platform of the derivation if cross compiling.
@@ -315,7 +352,7 @@ else let
# suffix. But we have some weird ones with run-time deps that are
# just used for their side-affects. Those might as well since the
# hash can't be the same. See #32986.
hostSuffix = lib.optionalString
hostSuffix = optionalString
(stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)
"-${stdenv.hostPlatform.config}";
@@ -324,17 +361,17 @@ else let
# nix and nixStatic. This should be also achieved by moving the
# hostSuffix before the version, so we could contemplate removing
# it again.
staticMarker = lib.optionalString stdenv.hostPlatform.isStatic "-static";
staticMarker = optionalString stdenv.hostPlatform.isStatic "-static";
in
lib.strings.sanitizeDerivationName (
if attrs ? name
then attrs.name + hostSuffix
else
# we cannot coerce null to a string below
assert lib.assertMsg (attrs ? version && attrs.version != null) "The ‘version’ attribute cannot be null.";
assert assertMsg (attrs ? version && attrs.version != null) "The ‘version’ attribute cannot be null.";
"${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"
);
}) // lib.optionalAttrs __structuredAttrs { env = checkedEnv; } // {
}) // optionalAttrs __structuredAttrs { env = checkedEnv; } // {
builder = attrs.realBuilder or stdenv.shell;
args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
inherit stdenv;
@@ -351,22 +388,22 @@ else let
__ignoreNulls = true;
inherit __structuredAttrs strictDeps;
depsBuildBuild = lib.elemAt (lib.elemAt dependencies 0) 0;
nativeBuildInputs = lib.elemAt (lib.elemAt dependencies 0) 1;
depsBuildTarget = lib.elemAt (lib.elemAt dependencies 0) 2;
depsHostHost = lib.elemAt (lib.elemAt dependencies 1) 0;
buildInputs = lib.elemAt (lib.elemAt dependencies 1) 1;
depsTargetTarget = lib.elemAt (lib.elemAt dependencies 2) 0;
depsBuildBuild = elemAt (elemAt dependencies 0) 0;
nativeBuildInputs = elemAt (elemAt dependencies 0) 1;
depsBuildTarget = elemAt (elemAt dependencies 0) 2;
depsHostHost = elemAt (elemAt dependencies 1) 0;
buildInputs = elemAt (elemAt dependencies 1) 1;
depsTargetTarget = elemAt (elemAt dependencies 2) 0;
depsBuildBuildPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 0;
propagatedNativeBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 0) 1;
depsBuildTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 2;
depsHostHostPropagated = lib.elemAt (lib.elemAt propagatedDependencies 1) 0;
propagatedBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 1) 1;
depsTargetTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 2) 0;
depsBuildBuildPropagated = elemAt (elemAt propagatedDependencies 0) 0;
propagatedNativeBuildInputs = elemAt (elemAt propagatedDependencies 0) 1;
depsBuildTargetPropagated = elemAt (elemAt propagatedDependencies 0) 2;
depsHostHostPropagated = elemAt (elemAt propagatedDependencies 1) 0;
propagatedBuildInputs = elemAt (elemAt propagatedDependencies 1) 1;
depsTargetTargetPropagated = elemAt (elemAt propagatedDependencies 2) 0;
# This parameter is sometimes a string, sometimes null, and sometimes a list, yuck
configureFlags = let inherit (lib) optional elem; in
configureFlags =
configureFlags
++ optional (elem "build" configurePlatforms) "--build=${stdenv.buildPlatform.config}"
++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}"
@@ -374,21 +411,21 @@ else let
cmakeFlags =
cmakeFlags
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) ([
"-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" (lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}"
] ++ lib.optionals (stdenv.hostPlatform.uname.processor != null) [
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) ([
"-DCMAKE_SYSTEM_NAME=${findFirst isString "Generic" (optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}"
] ++ optionals (stdenv.hostPlatform.uname.processor != null) [
"-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}"
] ++ lib.optionals (stdenv.hostPlatform.uname.release != null) [
] ++ optionals (stdenv.hostPlatform.uname.release != null) [
"-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.uname.release}"
] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
] ++ optionals (stdenv.hostPlatform.isDarwin) [
"-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}"
] ++ lib.optionals (stdenv.buildPlatform.uname.system != null) [
] ++ optionals (stdenv.buildPlatform.uname.system != null) [
"-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}"
] ++ lib.optionals (stdenv.buildPlatform.uname.processor != null) [
] ++ optionals (stdenv.buildPlatform.uname.processor != null) [
"-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}"
] ++ lib.optionals (stdenv.buildPlatform.uname.release != null) [
] ++ optionals (stdenv.buildPlatform.uname.release != null) [
"-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}"
] ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
] ++ optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
"-DCMAKE_CROSSCOMPILING_EMULATOR=env"
]);
@@ -403,7 +440,7 @@ else let
crossFile = builtins.toFile "cross-file.conf" ''
[properties]
bindgen_clang_arguments = ['-target', '${stdenv.targetPlatform.config}']
needs_exe_wrapper = ${lib.boolToString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform)}
needs_exe_wrapper = ${boolToString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform)}
[host_machine]
system = '${stdenv.targetPlatform.parsed.kernel.name}'
@@ -415,7 +452,7 @@ else let
llvm-config = 'llvm-config-native'
rust = ['rustc', '--target', '${stdenv.targetPlatform.rust.rustcTargetSpec}']
'';
crossFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ];
crossFlags = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ];
in crossFlags ++ mesonFlags;
inherit patches;
@@ -423,28 +460,28 @@ else let
inherit doCheck doInstallCheck;
inherit outputs;
} // lib.optionalAttrs (__contentAddressed) {
} // optionalAttrs (__contentAddressed) {
inherit __contentAddressed;
# Provide default values for outputHashMode and outputHashAlgo because
# most people won't care about these anyways
outputHashAlgo = attrs.outputHashAlgo or "sha256";
outputHashMode = attrs.outputHashMode or "recursive";
} // lib.optionalAttrs (enableParallelBuilding) {
} // optionalAttrs (enableParallelBuilding) {
inherit enableParallelBuilding;
enableParallelChecking = attrs.enableParallelChecking or true;
enableParallelInstalling = attrs.enableParallelInstalling or true;
} // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) {
} // optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) {
NIX_HARDENING_ENABLE = enabledHardeningOptions;
} // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? gcc.arch) {
} // optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? gcc.arch) {
requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.gcc.arch}" ];
} // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) {
} // optionalAttrs (stdenv.buildPlatform.isDarwin) {
inherit __darwinAllowLocalNetworking;
# TODO: remove lib.unique once nix has a list canonicalization primitive
# TODO: remove `unique` once nix has a list canonicalization primitive
__sandboxProfile =
let profiles = [ stdenv.extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ];
final = lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.unique profiles));
final = concatStringsSep "\n" (filter (x: x != "") (unique profiles));
in final;
__propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]);
__propagatedSandboxProfile = unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]);
__impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ stdenv.__extraImpureHostDeps ++ [
"/dev/zero"
"/dev/random"
@@ -471,21 +508,21 @@ else let
# to be built eventually, we would still like to get the error early and without
# having to wait while nix builds a derivation that might not be used.
# See also https://github.com/NixOS/nix/issues/4629
lib.optionalAttrs (attrs ? disallowedReferences) {
optionalAttrs (attrs ? disallowedReferences) {
disallowedReferences =
map unsafeDerivationToUntrackedOutpath attrs.disallowedReferences;
} //
lib.optionalAttrs (attrs ? disallowedRequisites) {
optionalAttrs (attrs ? disallowedRequisites) {
disallowedRequisites =
map unsafeDerivationToUntrackedOutpath attrs.disallowedRequisites;
} //
lib.optionalAttrs (attrs ? allowedReferences) {
optionalAttrs (attrs ? allowedReferences) {
allowedReferences =
lib.mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedReferences;
mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedReferences;
} //
lib.optionalAttrs (attrs ? allowedRequisites) {
optionalAttrs (attrs ? allowedRequisites) {
allowedRequisites =
lib.mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedRequisites;
mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedRequisites;
};
meta = checkMeta.commonMeta { inherit validity attrs pos references; };
@@ -493,20 +530,20 @@ else let
checkedEnv =
let
overlappingNames = lib.attrNames (builtins.intersectAttrs env derivationArg);
overlappingNames = attrNames (builtins.intersectAttrs env derivationArg);
in
assert lib.assertMsg envIsExportable
assert assertMsg envIsExportable
"When using structured attributes, `env` must be an attribute set of environment variables.";
assert lib.assertMsg (overlappingNames == [ ])
"The ‘env’ attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping: ${lib.concatStringsSep ", " overlappingNames}";
lib.mapAttrs
(n: v: assert lib.assertMsg (lib.isString v || lib.isBool v || lib.isInt v || lib.isDerivation v)
assert assertMsg (overlappingNames == [ ])
"The ‘env’ attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping: ${concatStringsSep ", " overlappingNames}";
mapAttrs
(n: v: assert assertMsg (isString v || isBool v || isInt v || isDerivation v)
"The ‘env’ attribute set can only contain derivation, string, boolean or integer attributes. The ‘${n}’ attribute is of type ${builtins.typeOf v}."; v)
env;
in
lib.extendDerivation
extendDerivation
validity.handled
({
# A derivation that always builds successfully and whose runtime
@@ -555,7 +592,7 @@ lib.extendDerivation
# should be made available to Nix expressions using the
# derivation (e.g., in assertions).
passthru)
(derivation (derivationArg // lib.optionalAttrs envIsExportable checkedEnv));
(derivation (derivationArg // optionalAttrs envIsExportable checkedEnv));
in
fnOrAttrs:
pkgs/tools/misc/moar/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "moar";
version = "1.18.2";
version = "1.18.3";
src = fetchFromGitHub {
owner = "walles";
repo = pname;
rev = "v${version}";
hash = "sha256-bYrn1Ok1yyhiKPUBdvUvTKVeAwsWAwbNoK3IburOAuU=";
hash = "sha256-Wj7zKszVtaTwcIoTtjHasShEnSDoiZ53Gnz38Ci31Hs=";
};
vendorHash = "sha256-x6BeU6JDayCOi8T8+NvXZe59QmTaO9RAYwSiFlDPL/c=";
pkgs/tools/networking/persepolis/0001-Allow-building-on-darwin.patch
+45
View File
@@ -0,0 +1,45 @@
---
setup.py | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/setup.py b/setup.py
index 985d28d..933f3df 100755
--- a/setup.py
+++ b/setup.py
@@ -24,13 +24,9 @@ import shutil
# finding os platform
os_type = platform.system()
-if os_type == 'Linux' or os_type == 'FreeBSD' or os_type == 'OpenBSD':
- from setuptools import setup, Command, find_packages
- setuptools_available = True
- print(os_type + " detected!")
-else:
- print('This script is only work for GNU/Linux or BSD!')
- sys.exit(1)
+from setuptools import setup, Command, find_packages
+setuptools_available = True
+print(os_type + " detected!")
# Checking dependencies!
not_installed = ''
@@ -100,6 +96,7 @@ else:
print('paplay is found!')
# sound-theme-freedesktop
+notifications_path = ''
if os_type == 'Linux':
notifications_path = '/usr/share/sounds/freedesktop/stereo/'
elif os_type == 'FreeBSD' or os_type == 'OpenBSD':
@@ -139,7 +136,7 @@ if sys.argv[1] == "test":
DESCRIPTION = 'Persepolis Download Manager'
-if os_type == 'Linux':
+if os_type in ['Linux', 'Darwin']:
DATA_FILES = [
('/usr/share/man/man1/', ['man/persepolis.1.gz']),
('/usr/share/applications/', ['xdg/com.github.persepolisdm.persepolis.desktop']),
--
2.39.3 (Apple Git-145)
pkgs/tools/networking/persepolis/0002-Fix-startup-crash-on-darwin.patch
+41
View File
@@ -0,0 +1,41 @@
---
persepolis/scripts/mac_notification.py | 25 +++++++++----------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/persepolis/scripts/mac_notification.py b/persepolis/scripts/mac_notification.py
index 4d69929..9a9a7cf 100644
--- a/persepolis/scripts/mac_notification.py
+++ b/persepolis/scripts/mac_notification.py
@@ -15,20 +15,13 @@
# native notification on mac! needs Xcode (latest version) installed and pyobjc
# library from pip
-import Foundation
-import AppKit
-import objc
-
-NSUserNotification = objc.lookUpClass('NSUserNotification')
-NSUserNotificationCenter = objc.lookUpClass('NSUserNotificationCenter')
-
-
def notifyMac(title, subtitle, info_text, delay=0):
- notification = NSUserNotification.alloc().init()
- notification.setTitle_(title)
- notification.setSubtitle_(subtitle)
- notification.setInformativeText_(info_text)
- notification.setDeliveryDate_(Foundation.NSDate.dateWithTimeInterval_sinceDate_(
- delay, Foundation.NSDate.date()))
- NSUserNotificationCenter.defaultUserNotificationCenter(
- ).scheduleNotification_(notification)
+ print(f"""
+Warning: Persepolis was installed from nixpkgs, which currently breaks notifications
+ on macOS. Until https://github.com/NixOS/nixpkgs/issues/105156 is resolved,
+ this cannot be fixed. The notification that should've been displayed was:
+
+ title: {title}
+ subtitle: {subtitle}
+ info_text: {info_text}
+ """)
--
2.39.3 (Apple Git-145)
pkgs/tools/networking/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch
+29
View File
@@ -0,0 +1,29 @@
---
persepolis/scripts/download.py | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/persepolis/scripts/download.py b/persepolis/scripts/download.py
index aaabb35..69676d3 100644
--- a/persepolis/scripts/download.py
+++ b/persepolis/scripts/download.py
@@ -72,16 +72,8 @@ def startAria():
# in macintosh
elif os_type == 'Darwin':
- if aria2_path == "" or aria2_path == None or os.path.isfile(str(aria2_path)) == False:
-
- cwd = sys.argv[0]
- current_directory = os.path.dirname(cwd)
- aria2d = os.path.join(current_directory, 'aria2c')
- else:
- aria2d = aria2_path
-
- subprocess.Popen([aria2d, '--no-conf',
+ subprocess.Popen(['aria2c', '--no-conf',
'--enable-rpc', '--rpc-listen-port=' + str(port),
'--rpc-max-request-size=2M',
'--rpc-listen-all', '--quiet=true'],
--
2.39.3 (Apple Git-145)
pkgs/tools/networking/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch
+34
View File
@@ -0,0 +1,34 @@
---
persepolis/scripts/mainwindow.py | 2 +-
persepolis/scripts/useful_tools.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/persepolis/scripts/mainwindow.py b/persepolis/scripts/mainwindow.py
index d21f3f4..a0e3674 100644
--- a/persepolis/scripts/mainwindow.py
+++ b/persepolis/scripts/mainwindow.py
@@ -161,7 +161,7 @@ class CheckVersionsThread(QThread):
else:
pipe = subprocess.Popen(
- [ffmpeg_path, '-version'],
+ ['ffmpeg', '-version'],
stdout=subprocess.PIPE,
stdin=subprocess.PIPE,
stderr=subprocess.PIPE,
diff --git a/persepolis/scripts/useful_tools.py b/persepolis/scripts/useful_tools.py
index b780967..31733eb 100644
--- a/persepolis/scripts/useful_tools.py
+++ b/persepolis/scripts/useful_tools.py
@@ -342,7 +342,7 @@ def muxer(parent, video_finder_dictionary):
current_directory = os.path.dirname(cwd)
ffmpeg_path = os.path.join(current_directory, 'ffmpeg')
- pipe = subprocess.Popen([ffmpeg_path, '-i', video_file_path,
+ pipe = subprocess.Popen(['ffmpeg', '-i', video_file_path,
'-i', audio_file_path,
'-c', 'copy',
'-shortest',
--
2.39.3 (Apple Git-145)
pkgs/tools/networking/persepolis/default.nix
+27 -7
View File
@@ -1,5 +1,9 @@
{ lib, stdenv, buildPythonApplication, fetchFromGitHub
{ lib
, stdenv
, buildPythonApplication
, fetchFromGitHub
, aria
, ffmpeg
, libnotify
, pulseaudio
, psutil
@@ -9,7 +13,7 @@
, setuptools
, sound-theme-freedesktop
, wrapQtAppsHook
, youtube-dl
, yt-dlp
}:
buildPythonApplication rec {
@@ -26,10 +30,27 @@ buildPythonApplication rec {
# see: https://github.com/persepolisdm/persepolis/blob/3.2.0/setup.py#L130
doCheck = false;
preBuild=''
preBuild=
# Make setup automatic
''
substituteInPlace setup.py --replace "answer = input(" "answer = 'y'#"
'' +
# Replace abandoned youtube-dl with maintained fork yt-dlp. Fixes https://github.com/persepolisdm/persepolis/issues/930,
# can be removed if that issue is fixed and/or https://github.com/persepolisdm/persepolis/pull/936 is merged
''
substituteInPlace setup.py ./persepolis/scripts/video_finder_addlink.py --replace \
"import youtube_dl" "import yt_dlp as youtube_dl"
'';
patches = lib.optionals stdenv.isDarwin [
# Upstream is abandonware, the last commit to master was on 2021-08-26.
# If it is forked or picked up again, consider upstreaming these patches.
./0001-Allow-building-on-darwin.patch
./0002-Fix-startup-crash-on-darwin.patch
./0003-Search-PATH-for-aria2c-on-darwin.patch
./0004-Search-PATH-for-ffmpeg-on-darwin.patch
];
postPatch = ''
sed -i 's|/usr/share/sounds/freedesktop/stereo/|${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/|' setup.py
sed -i "s|'persepolis = persepolis.__main__'|'persepolis = persepolis.scripts.persepolis:main'|" setup.py
@@ -46,7 +67,7 @@ buildPythonApplication rec {
# feed args to wrapPythonApp
makeWrapperArgs = [
"--prefix PATH : ${lib.makeBinPath [aria libnotify ]}"
"--prefix PATH : ${lib.makeBinPath [ aria ffmpeg libnotify ]}"
"\${qtWrapperArgs[@]}"
];
@@ -58,14 +79,13 @@ buildPythonApplication rec {
setproctitle
setuptools
sound-theme-freedesktop
youtube-dl
yt-dlp
];
meta = with lib; {
description = "Persepolis Download Manager is a GUI for aria2";
homepage = "https://persepolisdm.github.io/";
broken = stdenv.isDarwin; # Upstream’s build scripts check and fail on Darwin.
license = licenses.gpl3;
maintainers = [ ];
maintainers = with maintainers; [ iFreilicht ];
};
}
pkgs/tools/security/dnsx/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "dnsx";
version = "1.1.5";
version = "1.1.6";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "dnsx";
rev = "refs/tags/v${version}";
hash = "sha256-hO6m4WsoK50tLBr7I9ui7HE3rxKpOES8IOugi04yeQo=";
hash = "sha256-dyqZXc5k76BwF2Kh2vm9d+dpvgpXK/8VQeGjx1UzA6k=";
};
vendorHash = "sha256-c3HHfcWppAUfKjePsB+/CvxJWjp5zV6TJvsm3yKH4cw=";
vendorHash = "sha256-S1mJMVfQSy49Lm4q3v05kjbXBlBgBt/AAzLOoQkk75A=";
# Tests require network access
doCheck = false;
pkgs/tools/security/rekor/default.nix
+3 -3
View File
@@ -4,13 +4,13 @@ let
generic = { pname, packageToBuild, description }:
buildGoModule rec {
inherit pname;
version = "1.3.2";
version = "1.3.3";
src = fetchFromGitHub {
owner = "sigstore";
repo = "rekor";
rev = "v${version}";
hash = "sha256-QiK+ixVURf5Fsx9YPgzYCuCy1wYjxTUXGVr4FIn41Xc=";
hash = "sha256-CFavEtv6wL6jiUayjyU27OkdToXIM4EP7v5ONFdAJ5w=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -23,7 +23,7 @@ let
'';
};
vendorHash = "sha256-0379IX5W51Z48CffK1F2ZCPGLUq0g8lZXIQqaupC5io=";
vendorHash = "sha256-BLK8IJWL2sZ5bdnJU48/XhplSGUOL8gE7pY8rL+rVFk=";
nativeBuildInputs = [ installShellFiles ];
pkgs/tools/security/sigma-cli/default.nix
+2 -2
View File
@@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "sigma-cli";
version = "0.7.8";
version = "0.7.9";
format = "pyproject";
src = fetchFromGitHub {
owner = "SigmaHQ";
repo = "sigma-cli";
rev = "refs/tags/v${version}";
hash = "sha256-HvT2B0pahQbwa0atN2o9rc93QkCIaPttV859wOyHQzY=";
hash = "sha256-CWoVVvhprqBW4bmcAHtgJbbOPxGbBsikNu6bwyDdIcc=";
};
postPatch = ''
pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
+1 -1
View File
@@ -70,7 +70,7 @@ let
# group the specified outputs
specified = builtins.partition (p: p.outputSpecified or false) all;
specifiedOutputs = builtins.groupBy (p: p.tlOutputName or p.outputName) specified.right;
specifiedOutputs = lib.groupBy (p: p.tlOutputName or p.outputName) specified.right;
otherOutputNames = builtins.catAttrs "key" (builtins.genericClosure {
startSet = map (key: { inherit key; }) (lib.concatLists (builtins.catAttrs "outputs" specified.wrong));
operator = _: [ ];
pkgs/top-level/python-aliases.nix
+2
View File
@@ -402,6 +402,7 @@ mapAliases ({
smart_open = smart-open; # added 2021-03-14
smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01
sorl_thumbnail = sorl-thumbnail; # added 2023-11-12
SPARQLWrapper = sparqlwrapper;
sphinx-jquery = sphinxcontrib-jquery; # added 2023-02-24
sphinx_pypi_upload = throw "sphinx_pypi_upload has been removed since it is abandoned."; # added 2023-10-11
@@ -461,6 +462,7 @@ mapAliases ({
zope_component = zope-component; # added 2023-07-28
zope_contenttype = zope-contenttype; # added 2023-10-11
zope_deprecation = zope-deprecation; # added 2023-10-07
zope_dottedname = zope-dottedname; # added 2023-11-12
zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29
zope_lifecycleevent = zope-lifecycleevent; # added 2023-10-11
zope_proxy = zope-proxy; # added 2023-10-07
pkgs/top-level/python-packages.nix
+2 -2
View File
@@ -13092,7 +13092,7 @@ self: super: with self; {
sopel = callPackage ../development/python-modules/sopel { };
sorl_thumbnail = callPackage ../development/python-modules/sorl_thumbnail { };
sorl-thumbnail = callPackage ../development/python-modules/sorl-thumbnail { };
sortedcollections = callPackage ../development/python-modules/sortedcollections { };
@@ -16089,7 +16089,7 @@ self: super: with self; {
zope-deprecation = callPackage ../development/python-modules/zope-deprecation { };
zope_dottedname = callPackage ../development/python-modules/zope_dottedname { };
zope-dottedname = callPackage ../development/python-modules/zope-dottedname { };
zope_event = callPackage ../development/python-modules/zope_event { };