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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2023-06-06 00:02:23 +00:00
committed by GitHub
parent d308478595 49e06b9347
commit df605ef34f
46 changed files with 7088 additions and 1659 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+12
View File
@@ -11464,6 +11464,12 @@
fingerprint = "E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564";
}];
};
nielsegberts = {
email = "nix@nielsegberts.nl";
github = "nielsegberts";
githubId = 368712;
name = "Niels Egberts";
};
nigelgbanks = {
name = "Nigel Banks";
email = "nigel.g.banks@gmail.com";
@@ -16133,6 +16139,12 @@
githubId = 3159881;
name = "Tobias Markus";
};
tm-drtina = {
email = "tm.drtina@gmail.com";
github = "tm-drtina";
githubId = 26902865;
name = "Tomas Drtina";
};
tmountain = {
email = "tinymountain@gmail.com";
github = "tmountain";
nixos/modules/services/web-apps/hedgedoc.nix
+2 -1
View File
@@ -624,7 +624,8 @@ in
'';
};
clientSecret = mkOption {
type = types.str;
type = with types; nullOr str;
default = null;
description = lib.mdDoc ''
Specify the OAuth client secret.
'';
pkgs/applications/editors/vim/plugins/generated.nix
+224 -212
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+30 -30
View File
@@ -192,23 +192,23 @@
};
comment = buildGrammar {
language = "comment";
version = "0.0.0+rev=f08e7d4";
version = "0.0.0+rev=94c99a6";
src = fetchFromGitHub {
owner = "stsewd";
repo = "tree-sitter-comment";
rev = "f08e7d44b2923e9da2bf487a2f365d08677d368e";
hash = "sha256-v3h4x3R+9xbCEFezZlWPPM2Hb4575mbRkkyw7oz7K+U=";
rev = "94c99a66bb5051d8321b5900aee92b76450c50ce";
hash = "sha256-ma1LIiNuccXNftijehRzABVv7R3Jw9Wcjz0X2vGqaIc=";
};
meta.homepage = "https://github.com/stsewd/tree-sitter-comment";
};
commonlisp = buildGrammar {
language = "commonlisp";
version = "0.0.0+rev=c7e8149";
version = "0.0.0+rev=5b83fc6";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-commonlisp";
rev = "c7e814975ab0d0d04333d1f32391c41180c58919";
hash = "sha256-63B9d5feHzwY7WDoeoPAwsuLYgVvoGQf0wkUdDO/A8M=";
rev = "5b83fc6c2e45df43333db605e87615cdf00eb164";
hash = "sha256-jEUQe0YkQ/HTF6Ld1/7bkBvpRR4nDYgNNkoKe3xQeMc=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-commonlisp";
};
@@ -269,12 +269,12 @@
};
cuda = buildGrammar {
language = "cuda";
version = "0.0.0+rev=867c97e";
version = "0.0.0+rev=32efc63";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-cuda";
rev = "867c97ed7769e56bff99f7122cf63effadb812cc";
hash = "sha256-eSWY1z4kRD07YYeDTxGmiuI8FFClFsOfyaCDRtkEX1M=";
rev = "32efc637d841d3adcebb182e4420bc1dd48dab9f";
hash = "sha256-iD/cfP2pkHAZ207VEcronrbaBgHF13lyQjpkGOrmyEY=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
};
@@ -392,12 +392,12 @@
};
elixir = buildGrammar {
language = "elixir";
version = "0.0.0+rev=869dff3";
version = "0.0.0+rev=4ba9dab";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "tree-sitter-elixir";
rev = "869dff3ceb8823ca4b17ca33b663667c8e41e8ba";
hash = "sha256-wEGW4+O8ATlsrzC+qwhTtd39L5gbQM7B7N4MqabfIFQ=";
rev = "4ba9dab6e2602960d95b2b625f3386c27e08084e";
hash = "sha256-V/7aS+H4X8YzoJOIU9xpJBVvBjbcvwvTxeCsb9X39/I=";
};
meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir";
};
@@ -1096,24 +1096,24 @@
};
markdown = buildGrammar {
language = "markdown";
version = "0.0.0+rev=fa6bfd5";
version = "0.0.0+rev=231f316";
src = fetchFromGitHub {
owner = "MDeiml";
repo = "tree-sitter-markdown";
rev = "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d";
hash = "sha256-P31TiBW5JqDfYJhWH6pGqD2aWan0Bo1Tl0ONEg7ePnM=";
rev = "231f3163cd27d48f91a4517cfdf72d167a9ef164";
hash = "sha256-Fcq99HcTOcZwXs0V2zpTiDDQVcGocZQ0we5On9p+Uck=";
};
location = "tree-sitter-markdown";
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
};
markdown_inline = buildGrammar {
language = "markdown_inline";
version = "0.0.0+rev=fa6bfd5";
version = "0.0.0+rev=231f316";
src = fetchFromGitHub {
owner = "MDeiml";
repo = "tree-sitter-markdown";
rev = "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d";
hash = "sha256-P31TiBW5JqDfYJhWH6pGqD2aWan0Bo1Tl0ONEg7ePnM=";
rev = "231f3163cd27d48f91a4517cfdf72d167a9ef164";
hash = "sha256-Fcq99HcTOcZwXs0V2zpTiDDQVcGocZQ0we5On9p+Uck=";
};
location = "tree-sitter-markdown-inline";
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
@@ -1509,12 +1509,12 @@
};
racket = buildGrammar {
language = "racket";
version = "0.0.0+rev=ed5369a";
version = "0.0.0+rev=e196cd4";
src = fetchFromGitHub {
owner = "6cdh";
repo = "tree-sitter-racket";
rev = "ed5369ad17166c0749ab7241d826c438bd69338d";
hash = "sha256-/vvmVirIXH6uAtqEGvG//3XobLFzWCYXIGe4e0N1DsU=";
rev = "e196cd417c425c2c3dc54f3b7b7666fe968ba50b";
hash = "sha256-BSHa+CnxMflSCwmxrtMGLS9/wqBfi7NFwmG2LyXKm6c=";
};
meta.homepage = "https://github.com/6cdh/tree-sitter-racket";
};
@@ -1575,12 +1575,12 @@
};
rst = buildGrammar {
language = "rst";
version = "0.0.0+rev=25e6328";
version = "0.0.0+rev=c7c2b24";
src = fetchFromGitHub {
owner = "stsewd";
repo = "tree-sitter-rst";
rev = "25e6328872ac3a764ba8b926aea12719741103f1";
hash = "sha256-g3CovnXY15SkxAdVk15M4hAxizqLc551omwKKG+Vozg=";
rev = "c7c2b24918e231072af2d10c03b4893818de9d5d";
hash = "sha256-qLnP6OCWJv/CbRCsgKKwLY+QVulQdpqgVO3EjuPwypE=";
};
meta.homepage = "https://github.com/stsewd/tree-sitter-rst";
};
@@ -1619,12 +1619,12 @@
};
scheme = buildGrammar {
language = "scheme";
version = "0.0.0+rev=dd9a73d";
version = "0.0.0+rev=0c763bd";
src = fetchFromGitHub {
owner = "6cdh";
repo = "tree-sitter-scheme";
rev = "dd9a73d851238881a3a9426298d69742d24b7842";
hash = "sha256-KyR7MuZBMkQ3fWRaP1nQqo/ih2v3XM2v5tdu0SGuDOA=";
rev = "0c763bd5f85b18e354bc338d17cf1daa23b478b1";
hash = "sha256-MHQdWH7nNBAJGLb6DN0NmpwQIIyO0+JznVPkTvryupU=";
};
meta.homepage = "https://github.com/6cdh/tree-sitter-scheme";
};
@@ -1944,12 +1944,12 @@
};
usd = buildGrammar {
language = "usd";
version = "0.0.0+rev=04816b1";
version = "0.0.0+rev=718a6b3";
src = fetchFromGitHub {
owner = "ColinKennedy";
repo = "tree-sitter-usd";
rev = "04816b1fbfe548e1446a9efe8b069f3f6e095504";
hash = "sha256-n9sK02luVOv88P8SDCKIaBlEYtYYT0fQ+fjlYuP9AJY=";
rev = "718a6b3e939904e0b4fe7cff6742e96af4781f4b";
hash = "sha256-6U4TreAeAGB7WRUtTXdxQvNa6Sl6E+f329/SZ6DOQ+0=";
};
meta.homepage = "https://github.com/ColinKennedy/tree-sitter-usd";
};
pkgs/applications/editors/vim/plugins/vim-plugin-names
+1
View File
@@ -571,6 +571,7 @@ https://github.com/bfredl/nvim-luadev/,HEAD,
https://github.com/rafcamlet/nvim-luapad/,,
https://github.com/scalameta/nvim-metals/,,
https://github.com/gpanders/nvim-moonwalk/,,
https://github.com/SmiteshP/nvim-navbuddy/,,
https://github.com/smiteshp/nvim-navic/,HEAD,
https://github.com/AckslD/nvim-neoclip.lua/,,
https://github.com/yamatsum/nvim-nonicons/,,
pkgs/applications/misc/1password-gui/default.nix
+5 -5
View File
@@ -9,25 +9,25 @@
let
pname = "1password";
version = if channel == "stable" then "8.10.6" else "8.10.7-11.BETA";
version = if channel == "stable" then "8.10.7" else "8.10.7-11.BETA";
sources = {
stable = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
sha256 = "sha256-wCY94x67z+X8l3wr79+BXuu6/UXJldbVIA67AAD9mj0=";
sha256 = "sha256-5KMAzstoPmNgFejp21R8PcdrmUtkX3qxHYX3rV5JqyE=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
sha256 = "sha256-iLjuudWmkLMuoZSZZo9pRpx0MZludUrGTpTHCTNk4Vo=";
sha256 = "sha256-Tmof+ma1SJMQRSV1T5flLeXfe6W1a2U2mYzi+MrxvJM=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
sha256 = "sha256-FVj5x1RVBxPsgWhG6R4ykarZdLdJcj6gO5mQy3hHB4M=";
sha256 = "sha256-jtqgJJy1ZhyaEUEafT1ywD529aKGDqc0J3mgYSGVTWU=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
sha256 = "sha256-ilQP1OF4gydzlLZq3aZzqNbzvacRbruzWS7pVt6DP9g=";
sha256 = "sha256-qLqK6CZcqDfIGX0FzEnAZP3Rkxw8CNtT6sFy8u0IqwM=";
};
};
beta = {
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+405 -405
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/firefox/packages.nix
+4 -4
View File
@@ -3,10 +3,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
version = "113.0.2";
version = "114.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "7b1ff7d547fda02901f54a2593e03598a830698192003d833e27b85db0e00571ff66e03ebd4089e76fa65b09df000cbb2542450beeabb0b310875910603e6743";
sha512 = "c6929d34583f25119738d1c817a24fd358fcada1f0ba5c14bab07c2acd35f18a012f23d054bfe8c6b12c0dda7bd3abdc7a305a36c7a4d36542885abeea3aafec";
};
meta = {
@@ -85,11 +85,11 @@
firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr-102";
version = "102.11.0esr";
version = "102.12.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "fdfed404c87f33001c0ab50f9899fa80c897fac645be8ed832e426f412aafbf1468b1c8301bad463b3f5535b6d6f2005a96a748b6e2d6bf5afbc3b5bc10983d6";
sha512 = "2a85cf1e1c83a862c2886a63dcf3e3e8bca9dd3ed72c5d0223db52387fff3796bc0dcbb508adb8c10a30729f20554c5aac37f8ad045b0088a593d28e39d77fe5";
};
meta = {
pkgs/applications/networking/filebrowser/default.nix
+60
View File
@@ -0,0 +1,60 @@
{ buildGoModule, buildNpmPackage, fetchFromGitHub, lib }:
let
frontend = buildNpmPackage rec {
pname = "filebrowser-frontend";
version = "2.23.0";
src = fetchFromGitHub {
owner = "filebrowser";
repo = "filebrowser";
rev = "v${version}";
hash = "sha256-xhBIJcEtxDdMXSgQtLAV0UWzPtrvKEil0WV76K5ycBc=";
};
sourceRoot = "source/frontend";
npmDepsHash = "sha256-acNIMKHc4q7eiFLPBtKZBNweEsrt+//0VR6dqwXHTvA=";
NODE_OPTIONS = "--openssl-legacy-provider";
installPhase = ''
runHook preInstall
mkdir $out
mv dist $out
runHook postInstall
'';
};
in
buildGoModule rec {
pname = "filebrowser";
version = "2.23.0";
src = fetchFromGitHub {
owner = "filebrowser";
repo = "filebrowser";
rev = "v${version}";
hash = "sha256-xhBIJcEtxDdMXSgQtLAV0UWzPtrvKEil0WV76K5ycBc=";
};
vendorHash = "sha256-MR0ju2Nomb3j78Z+1YcJY+jPd40MZpuOTuQJM94AM8A=";
excludedPackages = [ "tools" ];
preBuild = ''
cp -r ${frontend}/dist frontend/
'';
passthru = {
inherit frontend;
};
meta = with lib; {
description = "Filebrowser is a web application for managing files and directories";
homepage = "https://filebrowser.org";
license = licenses.asl20;
maintainers = with maintainers; [ nielsegberts ];
};
}
pkgs/applications/radio/flrig/default.nix
+2 -2
View File
@@ -8,12 +8,12 @@
}:
stdenv.mkDerivation rec {
version = "2.0.0";
version = "2.0.01";
pname = "flrig";
src = fetchurl {
url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
sha256 = "sha256-DTqheZhCSrupokhVqGrOwBcXwQRgoMv16fMjEFRqbCA=";
sha256 = "sha256-TFZZaTtU7TLBPA7jpBTu2JtkZpxjG57Rin8OVFedHwA=";
};
buildInputs = [
pkgs/applications/version-management/git-credential-keepassxc/default.nix
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-credential-keepassxc";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "Frederick888";
repo = "git-credential-keepassxc";
rev = "v${version}";
hash = "sha256-siVSZke+anVTaLiJVyDEKvgX+VmS0axa+4721nlgmiw=";
hash = "sha256-eu4Ff+7670gCO+j3WSRnvQ1aFXIx0nw1jAZXNuni2bU=";
};
cargoHash = "sha256-QMAAKkjWgM/UiOfkNMLQxyGEYYmiSvE0Pd8fZXYyN48=";
cargoHash = "sha256-DVMQLsiiaxMZtDqzqnMJQl91NCuMRSPEb8B6AttB4lE=";
buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ];
pkgs/build-support/fetchgit/default.nix
+5 -5
View File
@@ -54,16 +54,16 @@ lib.makeOverridable (
*/
assert deepClone -> leaveDotGit;
assert nonConeMode -> !(sparseCheckout == "" || sparseCheckout == []);
assert nonConeMode -> (sparseCheckout != []);
if md5 != "" then
throw "fetchgit does not support md5 anymore, please use sha256"
else if hash != "" && sha256 != "" then
throw "Only one of sha256 or hash can be set"
else if builtins.isString sparseCheckout then
# Changed to throw on 2023-06-04
throw "Please provide directories/patterns for sparse checkout as a list of strings. Passing a (multi-line) string is not supported any more."
else
# Added 2022-11-12
lib.warnIf (builtins.isString sparseCheckout)
"Please provide directories/patterns for sparse checkout as a list of strings. Support for passing a (multi-line) string is deprecated and will be removed in the next release."
stdenvNoCC.mkDerivation {
inherit name;
builder = ./builder.sh;
@@ -84,7 +84,7 @@ stdenvNoCC.mkDerivation {
# git-sparse-checkout(1) says:
# > When the --stdin option is provided, the directories or patterns are read
# > from standard in as a newline-delimited list instead of from the arguments.
sparseCheckout = if builtins.isString sparseCheckout then sparseCheckout else builtins.concatStringsSep "\n" sparseCheckout;
sparseCheckout = builtins.concatStringsSep "\n" sparseCheckout;
inherit url rev leaveDotGit fetchLFS fetchSubmodules deepClone branchName nonConeMode postFetch;
pkgs/build-support/fetchgithub/default.nix
+1 -1
View File
@@ -25,7 +25,7 @@ let
};
passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "forceFetchGit" "private" "githubBase" "varPrefix" ];
varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_";
useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || !(sparseCheckout == "" || sparseCheckout == []);
useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || (sparseCheckout != []);
# We prefer fetchzip in cases we don't need submodules as the hash
# is more stable in that case.
fetcher = if useFetchGit then fetchgit else fetchzip;
pkgs/data/fonts/iosevka/default.nix
+3 -3
View File
@@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null;
buildNpmPackage rec {
pname = if set != null then "iosevka-${set}" else "iosevka";
version = "24.1.0";
version = "24.1.1";
src = fetchFromGitHub {
owner = "be5invis";
repo = "iosevka";
rev = "v${version}";
hash = "sha256-Th4+SUP1gqusGA680Ddh1YHUYJFJIe9zUSNE+NIDl40=";
hash = "sha256-kzf/DFks/Ovhl6uMw5Bqhq+j+alrUd4E49jgSmp2E2k=";
};
npmDepsHash = "sha256-ChK3fUqPX1F8CljJGNiquS+5ZTlpeBEuYRPGoxSsyuI=";
npmDepsHash = "sha256-FKA3D05E5A0Z3wdCYLzoTyYKLay25sc3O61rOzkIN2E=";
nativeBuildInputs = [
remarshal
pkgs/data/fonts/nerdfonts/shas.nix
+54 -54
View File
@@ -1,56 +1,56 @@
{
"3270" = "12a9zi38mi0ba581p42h0kdwrjh7jacq2z85ghn318a20m0sgh5l";
"Agave" = "17phx041dnn4bpmcqzwkmklh34kxafzjd0vfzkw5p6yblibnwzx8";
"AnonymousPro" = "1jpl6id8472bx74m90rry2gmxm365mcqrka6c1kk6nc87k38rz80";
"Arimo" = "14s3g3dl835bbzj52g7n4pm3c3hfhssm7rsqrprms2yknbffmbpc";
"AurulentSansMono" = "0v49zig6f16a0g0pp4qng9scn452569lrlvr5svz2zx44yz8aji2";
"BigBlueTerminal" = "10n1pg20brwprl6qxvcg20zwyvp7jaazxaz0n9724zxs9sjjkk7h";
"BitstreamVeraSansMono" = "1sc959pw6vlp9qklria6iq36bakmh51p5z98qh6p926sd0ila656";
"CascadiaCode" = "04jwlxzp2r82nhmhfav14wxygshr2gkl0s7lijc97p8z32fkygbq";
"CodeNewRoman" = "0c5cn71mayabaiz3rnpszvg1p3i067a6f71kqjm38136livpq8ig";
"ComicShannsMono" = "09a50xcac4asik7mb3mcpkf5sjaa6yssq2ky999pjkccpp0sk2hq";
"Cousine" = "0azc7jfv8dkxz5874d9w7wx1033w8d6agzic6inp6gd3vxfpn949";
"DaddyTimeMono" = "1pnx92g4wc6a9xs3qkckig24v5g897xz520hpprzbqxdqbdamg8w";
"DejaVuSansMono" = "0abm1lprkr396dqg7hi54mdb5mgaqb0ld9k0a9v93h2gi7n6jd2l";
"DroidSansMono" = "0hpqa3zcp3qygvm24zrhcp0rv28lgpqra72l15il9391c4rday7j";
"FantasqueSansMono" = "0cwbwlmlw9ijh6nb2nip918qfwf2h7h4ra6z1xi6sfp3mkbrdm0j";
"FiraCode" = "13n9xi7jsd2zn7nmgf7hz1d4blqxb0d0z6q36zscc6w1140m3a59";
"FiraMono" = "1zlqxmdfy2pamfwz8n46jksxws19jlv6a1jyjg27cmcm6g2phlwr";
"Go-Mono" = "1qyna6720s7ljijqw28dsc3xixpc1c603h7avaqraj7xbhx2bch0";
"Gohu" = "08dsi6hwahc0d2f40p976anm2c07x2i7wbpcf27sm53f8q4yc07q";
"Hack" = "18f196963sw6y9kpyixij6wxkzzay2pgz11xyy63k6wc54z2zmvp";
"Hasklig" = "12yl427kbvj3s9nhzgn0q6pmj8jr0vh58xm7h2q3v0qfw51vdwih";
"HeavyData" = "1752rbgawhwx5hbqwf1v3njl1n2fgbylkr45wrz3jxb4089nsmn8";
"Hermit" = "05vi0dfg77a54z5m0nqcyzyz646r7r7nbxm76mwv4n4w9dr319h3";
"iA-Writer" = "1v3zs49s5712z7mq7v06r325lk6q7syd6mqd45520ik35nskpyh3";
"IBMPlexMono" = "0q6g551n1n6hihbaybydsks6v0hzw0izpmr5ncmiamcibdjw7nn8";
"Inconsolata" = "1fpyasnsb7zq6k7kdhwz4jcnslz5fsmcn53gfspvznlnassm5fl4";
"InconsolataGo" = "0kr2piwvfvplniq8sp64sw4p05mfycykc8i8pmb7vbs8ybgkgka1";
"InconsolataLGC" = "025f1ixbvl7r0lk74ppmpfh2agq1hqjrn3vrzfh3skamwhy9dmsx";
"Iosevka" = "1n699bs61zld312d0kgyp07c4ac7cgixwlfg9c30fyf33jibw8wh";
"IosevkaTerm" = "06k8dcvqkah9bzlagmyl2lnwl0lm51f15f3v78l51p2rnlqmi0n6";
"JetBrainsMono" = "0sj6ssdznxabxrvc7ar2rbf2fwadixjirk07xdk2vwyavgpyajf0";
"Lekton" = "0j2jaz2w7nbs0c6awxqj79mqi6k058b58629r9ir8qhk7m5qmq7b";
"LiberationMono" = "18mc7rjvzlcblf0is83ds9sjvyglc5gjf0nbqa6xgm0hcp0lbmzv";
"Lilex" = "1kq56iws0cg6ayfmy21cs8l8496ryjsk3ayanbcyz962j913a7qh";
"Meslo" = "04g6najk9ar19pkq4v033h2xhv2rr6yrbp2gw29kpwzigjfjrzsw";
"Monofur" = "051ipzjngq2083xj3r99f5jfyshpsgw399rxspnzj4xz9n9803vl";
"Monoid" = "17gqr74cc5b3dz09z974ig4w8blwkiyky43gpw7ak1l073w9v3vm";
"Mononoki" = "0b91kncc6b14zigci05gv3hf4p88vd1xdis8x42zcjc6bjh8q64k";
"MPlus" = "0l4ydmspdj2hfmmc686isnmjqhka3vpy9clljpmx9l7cqygqifxk";
"NerdFontsSymbolsOnly" = "1rlv9kdakabkpjw12ji26xb42daj33zljfx3hhnffp8ky4vpxccd";
"Noto" = "0slrz3f975bzkah4g446rlb1ai85c91i3g8ciqlifq48pp51jm9m";
"OpenDyslexic" = "076ylnbbbwrxs8dm9w6bzs26jdc13s00l4qvyp699z4rgdzb9rgi";
"Overpass" = "0nf67kizh11amj72yjqv6wm1zgfkvfvrknss56b1ljifp5sgyc6h";
"ProFont" = "0bw3srnikbcyr7gkvr9pqx1i11z5wlr9bmfg2hia1wmbic73cbl4";
"ProggyClean" = "1m6m4gyb9iz3dwr5lmn18ciwib92015i0mqdw5kb2wmfrz5s9kks";
"RobotoMono" = "1qlss2xs8asg3cpdm2gxwzpaik8jhn1md8faficncphf9x9rdvzv";
"ShareTechMono" = "1sadgp9zw31rk71xa56l4fqbr7iv4j2l7mp1bdykrzv4r94swdl2";
"SourceCodePro" = "096wh4pq1s24i7xya0lqbr5z6ba9k4wr1229p9n7xkcf2hykgc9j";
"SpaceMono" = "0fk54ijh0x43vhk46inwhn7rcn2jgkx836461cqn1xfp5vc9y1hb";
"Terminus" = "0bxmvhzxd8vllwv2kjgp1j0iz5jhwwp9x1sjxwdsjv3pff3qm41j";
"Tinos" = "08pk46z03x4nnkrbp96i16fhmvp0gvk87s2w8dj51863ay0k80yb";
"Ubuntu" = "1gwndxsrp2289jgl1wkqyh5q236ax1835314igi0m3iq22vc07b5";
"UbuntuMono" = "0qikbhm3qv745kwa4mbkjp17rp10pbvld2xmfn20x4lb33xpny16";
"VictorMono" = "1hgqbyrqmjjbzdfxc38rf5mn7m424mchgqp9qs1cccc2qm6js05r";
"3270" = "00cmrlx30jz3gd9c1cjw3ddhr82ngzwn1brwcr8l7fahxb7gvq7z";
"Agave" = "0gnr12b5ah1xadm53fj5x0532kx8g6v5wc82c391d18h2azbllbm";
"AnonymousPro" = "0lqmghnj33jfv8rn1cyvq50j27kc19n5lfjr2adwsy2qixk499p9";
"Arimo" = "07v7m5m9vijdwwm0d63j67ciy2nlpkfy18s6q2d555n6yfs2yyb4";
"AurulentSansMono" = "1ndrs7bl0lxfahnrv91y0vsbvs0p3ah56drsvz5r3qw7sr4ffr09";
"BigBlueTerminal" = "0mms77748yc9qlzank48qqdc4as41zfkhbspv2scklz0n76v1f74";
"BitstreamVeraSansMono" = "0wkg8r6bryv4q320hrc3x2c78n1jp44s99hmbwjjplzh1g0j5x49";
"CascadiaCode" = "0bmzji880wbc3c4krw47kzf8mzb9abvv6wjybhynd1rjf31i27fj";
"CodeNewRoman" = "0w5plvvwxxzmlz0ylah5an4j0mlbj292nqvfgj5v9p5kbw68qgrl";
"ComicShannsMono" = "1ybxyn85ygm4ipg371b204mi6x7303yqriysiggb5bsfas2ymq6m";
"Cousine" = "0bkwf3h6wy9n3ii9ii4s16951w65vz54yyrdwxngcmrwapcii9y5";
"DaddyTimeMono" = "1w5n170l63hfxh1xclw3jpf8amj60br6py4yx12yhqanp2zg0shj";
"DejaVuSansMono" = "1j22f5jnpmyli686r67c4c07g07ac78aq9wg8hy1vwblxfzdvq9f";
"DroidSansMono" = "13r1sglgwf05swnbn0mha2gpdqammzlg0p6h7c33af1vr7n8cnca";
"FantasqueSansMono" = "1k0p6gvas6mgwq0bbvpwbn3mm6yaaapgjqgk30fvpq9zvn4a26bf";
"FiraCode" = "14vbb3w6il32kd8my75vvv786azm7sxmdpba9np0qjx4rs8xdhbn";
"FiraMono" = "1iiz5cnhrb67793ww6pj5y5x9s1a5nlk9kqwbv92kxmbqakarlcb";
"Go-Mono" = "0zdxyid1kw2prszhj69pqyrba6ywsxwb0ynnmwvqnc99bp0lx7pw";
"Gohu" = "0bx4mayqm5rqgd5p3xqpwrqn7338yjcsa9a1vi2qx4gycbp94qh5";
"Hack" = "1p8l53k6fzjbx7sjl05bq7xxnxmn7026sdgmyxqx4crmy18qxywk";
"Hasklig" = "1fvzhfjd0xqmkc4wl3dpdigdq5ni2gz2x9ip7fmfz5y9ipnbyf36";
"HeavyData" = "0w3zxdr9dmfk4k1m9n0fzn18kfgzq97bxf7i9xqfqikh3r1bpzjw";
"Hermit" = "1cmhf1xinspa3fqx95h2z3qlbv2p90zba4chg9mpv46vz3dmmkki";
"iA-Writer" = "10spld7a70phczw60chg7y21m8afz8vdrc9jklkrh045fhskqbh6";
"IBMPlexMono" = "050a44156320yjb14l6ycfg2z7isk0qb57ds5s6ixla6hr0z4g4h";
"Inconsolata" = "02rar6g3zbbpxxxz37v7d5qzafn59bhp04iv3wk16kqxy0havgx5";
"InconsolataGo" = "0nx6j3v2fvhdw3ygmz65zwlj6zwrkpmf59wfxirpzkcqqsdh4zwl";
"InconsolataLGC" = "00s2051fz3k6jnsfmnlqnd2cghr9sj2pddi5gpid1i5x006rig7a";
"Iosevka" = "1byrmfbsqi06fsy958364jy694dnm7a7pcjsv64w6mwfsi5vjn1r";
"IosevkaTerm" = "1k65jfa0c7c6pvns7vfcxcfc3i1qcr6wg16qafbp9zggabbvl7aa";
"JetBrainsMono" = "0mbzvfl36a6mgb2dnjf8n3kkm28sz0xhv7s5lww141wpgj5jb4a9";
"Lekton" = "0xnqdjr8hawcn1na07f06bxqlvrxbv0n4mmgnivl0clib0nna566";
"LiberationMono" = "1mh0h85nqlh78xngy6wz354a33nk0gghic18pf0a38h3ryssb44c";
"Lilex" = "032gymxaijinbsbbyr0jhqdyr5vhvs83208cirdwx4yjgir32bj9";
"Meslo" = "0awd09634biwjxxzzh4r3a5w2n0y0bybc2yh98yplw096n5k4nyv";
"Monofur" = "1z49di4zn8yxpwgs876n30mjisjir9gax08vs1i8sll4kdms5znw";
"Monoid" = "09ynmda4chlv69aipp33h3h5c3imbqqmh1iwnggvim36ga1h49lm";
"Mononoki" = "15pkg8s18xxwkp7qhvnd473f854n4m9340kvgs2r7y5xgzagcmrf";
"MPlus" = "0kj3kjhi4v9w2izsgx6sfn0g8xi6p5qmsgbpip9nff7n2qlfg02s";
"NerdFontsSymbolsOnly" = "1yschcw29kbddin7cvbc19wchwyarg0p8sy4265j306kafcakzgd";
"Noto" = "0sdzd1r8wjl980vq19q6067m54fnrhkdj46q9zi27s9nnffcxwdr";
"OpenDyslexic" = "19fsq8z06iz89a12kks3j51vn9r0fzq51wl14284g0ffbf4ylzk8";
"Overpass" = "0qc66qqjshlxb9i28j48ii3wcaiy8dq8zdx9zvp6a3wbj13r9wa4";
"ProFont" = "18743axd1rcpyk92a4hq3ymxz143601h8zi466d2j1x1vxhk852f";
"ProggyClean" = "17l9c02zfh8ilgyrd91jzibmmpw44qagbvzr9s1dacllkg0d4sbj";
"RobotoMono" = "05z6ccnrhrn51yip6d37jjyilp8i2mr1afnxl4kam21kgkcmz3bv";
"ShareTechMono" = "15j2dfnikq5jfcvfgmrpnycbb3mfj6mq8q3dqnimba5hpdlrd95a";
"SourceCodePro" = "0qzqwaiig2988159byirz5wnn2qj9qprmlbjrr4ybckis12ipkp2";
"SpaceMono" = "08ys3zl33fnlclcai9d8w3iadvrdnp2z14rz0bjk78syzy4nqj3p";
"Terminus" = "1jj5xbf9mr772wn5l1qbal5hn6cixwin5qhswa8f9zr36vlh86ss";
"Tinos" = "0w9w3f4vrvcm59nhzvj0wchx6cdqk8akb77ghwc70pwd35s2xd3j";
"Ubuntu" = "02k4x2gvbbqsmxmjrf9x9pwwja7xhxs9bi4ryp6w8x2mml82yf2h";
"UbuntuMono" = "0vw41mkiqy6yv929zabs6nhms9x0nzrkvmpirvvmnzj7f70gy73p";
"VictorMono" = "006a8p809w6337395lkghlz26qslhcglhg383ic2gxgvng2vcyp0";
}
pkgs/data/fonts/nerdfonts/version.nix
+1 -1
View File
@@ -1 +1 @@
"3.0.1"
"3.0.2"
pkgs/development/compilers/cudatoolkit/common.nix
+4 -1
View File
@@ -158,6 +158,10 @@ backendStdenv.mkDerivation rec {
"libcom_err.so.2"
];
preFixup = ''
patchelf $out/lib64/libnvrtc.so --add-needed libnvrtc-builtins.so
'';
unpackPhase = ''
sh $src --keep --noexec
@@ -342,4 +346,3 @@ backendStdenv.mkDerivation rec {
maintainers = teams.cuda.members;
};
}
pkgs/development/libraries/cpp-netlib/default.nix
+3
View File
@@ -17,6 +17,9 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DCPP-NETLIB_BUILD_SHARED_LIBS=ON"
# fatal error: 'boost/asio/stream_socket_service.hpp' file not found
"-DCPP-NETLIB_BUILD_EXAMPLES=OFF"
"-DCPP-NETLIB_BUILD_TESTS=OFF"
];
# Most tests make network GET requests to various websites
pkgs/development/libraries/libcs50/default.nix
+28
View File
@@ -0,0 +1,28 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation (finalAttrs: {
pname = "libcs50";
version = "11.0.2";
src = fetchFromGitHub {
owner = "cs50";
repo = "libcs50";
rev = "v${finalAttrs.version}";
hash = "sha256-A4CEU5wfwykVTDIsKZnQ8co+6RwBGYGZEZxRFzQTKBI=";
};
installPhase = ''
runHook preInstall
mkdir $out
cp -R build/lib $out/lib
cp -R build/include $out/include
ln -sf $out/lib/libcs50.so.11.0.2 $out/lib/libcs50.so.11
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/cs50/libcs50";
description = "CS50 Library for C";
license = licenses.gpl3Only;
};
})
pkgs/development/libraries/libnest2d/default.nix
+7 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }:
{ lib, stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
version = "4.12.0";
pname = "libnest2d";
@@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
sha256 = "1hzqi4z55x76rss3xk7hfqhy9hcaq2jaav5jqxa1aqmbvarr2gla";
};
postPatch = ''
substituteInPlace {,examples/}CMakeLists.txt \
--replace "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 14)"
'';
propagatedBuildInputs = [ clipper nlopt boost ];
nativeBuildInputs = [ cmake ];
pkgs/development/libraries/rdkafka/default.nix
+2 -2
View File
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "2.1.1";
src = fetchFromGitHub {
owner = "edenhill";
owner = "confluentinc";
repo = "librdkafka";
rev = "v${version}";
sha256 = "sha256-MwPRnD/S8o1gG6RWq2tKxqdpGum4FB5K8bHPAvlKW10=";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "librdkafka - Apache Kafka C/C++ client library";
homepage = "https://github.com/edenhill/librdkafka";
homepage = "https://github.com/confluentinc/librdkafka";
license = licenses.bsd2;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ commandodev ];
pkgs/development/python-modules/apache-airflow/providers.nix
-311
View File
File diff suppressed because one or more lines are too long
pkgs/development/python-modules/apscheduler/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "apscheduler";
version = "3.10.0";
version = "3.10.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "APScheduler";
inherit version;
hash = "sha256-pJ/CMmkhhBbw5BiQ7qenXtayhPEGMNz+hmq2WWIaNpY=";
hash = "sha256-ApOTfY9gUaD0kzWUQMGhuT6ILFfa8Bl6/v8Ocnd3uW4=";
};
buildInputs = [
pkgs/development/python-modules/argparse-dataclass/default.nix
+24
View File
@@ -0,0 +1,24 @@
{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }:
buildPythonPackage rec {
pname = "argparse-dataclass";
version = "1.0.0";
src = fetchFromGitHub {
owner = "mivade";
repo = "argparse_dataclass";
rev = version;
sha256 = "6//XQKUnCH3ZtOL6M/EstMJ537nEmbuGQNqfelTluOs=";
};
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "argparse_dataclass" ];
meta = with lib; {
description = "Declarative CLIs with argparse and dataclasses";
homepage = "https://github.com/mivade/argparse_dataclass";
license = licenses.mit;
maintainers = with maintainers; [ tm-drtina ];
};
}
pkgs/development/python-modules/flask-appbuilder/default.nix
+4 -2
View File
@@ -7,6 +7,7 @@
, email-validator
, flask
, flask-babel
, flask-limiter
, flask-login
, flask-openid
, flask-sqlalchemy
@@ -26,7 +27,7 @@
buildPythonPackage rec {
pname = "flask-appbuilder";
version = "4.2.1";
version = "4.3.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -34,7 +35,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Flask-AppBuilder";
inherit version;
hash = "sha256-rZbu0Bif5pOa/zu6MCrbGJpkqUdYzWyVgp6tqRzGyIc=";
hash = "sha256-FP92HEGOsufHtaIySqDiScD3QUu3iQhWdtvkOecUvuI=";
};
propagatedBuildInputs = [
@@ -44,6 +45,7 @@ buildPythonPackage rec {
email-validator
flask
flask-babel
flask-limiter
flask-login
flask-openid
flask-sqlalchemy
pkgs/development/python-modules/geopandas/default.nix
+4 -5
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "geopandas";
version = "0.13.0";
version = "0.13.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "geopandas";
repo = "geopandas";
rev = "refs/tags/v${version}";
hash = "sha256-GYEd679EX+gyGb2fpfyrJlGYPduc+W7I2tjTHegyWi8=";
hash = "sha256-k9/IowWi0jABeNhAjdJqbfcxp4eNzisTqS3RKBK2p58=";
};
propagatedBuildInputs = [
@@ -47,8 +47,7 @@ buildPythonPackage rec {
disabledTests = [
# Requires network access
"test_read_file_remote_geojson_url"
"test_read_file_remote_zipfile_url"
"test_read_file_url"
];
pytestFlagsArray = [
@@ -64,6 +63,6 @@ buildPythonPackage rec {
homepage = "https://geopandas.org";
changelog = "https://github.com/geopandas/geopandas/blob/v${version}/CHANGELOG.md";
license = licenses.bsd3;
maintainers = with maintainers; [ knedlsepp ];
maintainers = teams.geospatial.members;
};
}
pkgs/development/python-modules/python-daemon/default.nix
+2 -20
View File
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "python-daemon";
version = "2.3.0";
version = "3.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "bda993f1623b1197699716d68d983bb580043cf2b8a66a01274d9b8297b0aeaf";
sha256 = "sha256-bFdFI3L36v9Ak0ocA60YJr9eeTVY6H/vSRMeZGS02uU=";
};
nativeBuildInputs = [
@@ -39,23 +39,6 @@ buildPythonPackage rec {
testtools
];
patches = [
# Should be fixed in the next release
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/python-daemon/raw/rawhide/f/python-daemon-safe_hasattr.patch";
hash = "sha256-p5epAlM/sdel01oZkSI1vahUZYX8r90WCJuvBnfMaus=";
})
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/python-daemon/raw/rawhide/f/tests-remove-duplicate-mocking.patch";
hash = "sha256-5b/dFR3Z8xaPw8AZU95apDZd4ZfmMQhAmavWkVaJog8=";
})
];
disabledTestPaths = [
# requires removed distutils.command
"test_version.py"
];
disabledTests = [
"begin_with_TestCase"
"changelog_TestCase"
@@ -77,7 +60,6 @@ buildPythonPackage rec {
"daemon"
"daemon.daemon"
"daemon.pidfile"
"daemon.runner"
];
meta = with lib; {
pkgs/development/python-modules/rich-argparse/default.nix
+41
View File
@@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, hatchling
, rich
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "rich-argparse";
version = "1.1.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "hamdanal";
repo = "rich-argparse";
rev = "v${version}";
hash = "sha256-Rnv4A9pZ5VHpNjrWnsKyxQ4ISCLjIUu3tbbOzP4uFuw=";
};
propagatedBuildInputs = [
hatchling
rich
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"rich_argparse"
];
meta = with lib; {
description = "Format argparse help output using rich.";
homepage = "https://github.com/hamdanal/rich-argparse";
changelog = "https://github.com/hamdanal/rich-argparse/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ graham33 ];
};
}
pkgs/development/tools/codespelunker/default.nix
+25
View File
@@ -0,0 +1,25 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "codespelunker";
version = "1.0.0";
src = fetchFromGitHub {
owner = "boyter";
repo = "cs";
rev = "v${version}";
hash = "sha256-NN/78paePdvYHQ4J2aQu56PvEciOXY8DxHd4ajfVCFU=";
};
vendorHash = null;
subPackages = [ "." ];
meta = with lib; {
description = "A command code search tool";
homepage = "https://github.com/boyter/cs";
license = with licenses; [ mit unlicense ];
maintainers = with maintainers; [ viraptor ];
mainProgram = "cs";
};
}
pkgs/development/tools/rgp/default.nix
+3 -3
View File
@@ -19,15 +19,15 @@
}:
let
buildNum = "2023-04-25-1075";
buildNum = "2023-05-22-1083";
in
stdenv.mkDerivation {
pname = "rgp";
version = "1.15";
version = "1.15.1";
src = fetchurl {
url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz";
hash = "sha256-sk7Z+fmcDsbnYSjf4H4ke2U1pKTh/p4fWRj+f5XX6LQ=";
hash = "sha256-WSSiNiiIVw1wwt9vxgyirBDe+SPzH87LU1GlSdUhZB8=";
};
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
pkgs/development/tools/rye/Cargo.lock
Generated
+2354
View File
File diff suppressed because it is too large Load Diff
pkgs/development/tools/rye/default.nix
+20 -5
View File
@@ -1,6 +1,7 @@
{ lib
, fetchFromGitHub
, rustPlatform
, git
, openssl
, pkg-config
, stdenv
@@ -9,24 +10,38 @@
rustPlatform.buildRustPackage rec {
pname = "rye";
version = "unstable-2023-04-23";
version = "0.6.0";
src = fetchFromGitHub {
owner = "mitsuhiko";
repo = "rye";
rev = "b3fe43a4e462d10784258cad03c19c9738367346";
hash = "sha256-q9/VUWyrP/NsuLYY1+/5teYvDJGq646WbMXptnUUUyw=";
repo = pname;
rev = version;
# One of the tests runs git command so we need .git directory there
leaveDotGit = true;
sha256 = "llm4aqMfaVf3VbHudWjb9V2GFgJpP9S211Ui7xXdrAU=";
};
cargoHash = "sha256-eyJ6gXFVnSC1aEt5YLl5rFoa3+M73smu5wJdAN15HQM=";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"dialoguer-0.10.4" = "sha256-WDqUKOu7Y0HElpPxf2T8EpzAY3mY8sSn9lf0V0jyAFc=";
};
};
env = {
OPENSSL_NO_VENDOR = 1;
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
git
openssl
]
++ lib.optional stdenv.isDarwin SystemConfiguration;
nativeCheckInputs = [ git ];
meta = with lib; {
description = "A tool to easily manage python dependencies and environments";
homepage = "https://github.com/mitsuhiko/rye";
pkgs/development/python-modules/apache-airflow/0001-Revert-fix-yarn-warning-from-d3-color-27139.patch → pkgs/servers/apache-airflow/0001-Revert-fix-yarn-warning-from-d3-color-27139.patch
View File
pkgs/servers/apache-airflow/default.nix
+50
View File
@@ -0,0 +1,50 @@
{ lib
, fetchFromGitHub
, fetchPypi
, python3
}:
let
python = python3.override {
packageOverrides = pySelf: pySuper: {
# flask-appbuilder doesn't work with sqlalchemy 2.x, flask-appbuilder 3.x
# https://github.com/dpgaspar/Flask-AppBuilder/issues/2038
flask-appbuilder = pySuper.flask-appbuilder.overridePythonAttrs (o: {
meta.broken = false;
});
# a knock-on effect from overriding the sqlalchemy version
flask-sqlalchemy = pySuper.flask-sqlalchemy.overridePythonAttrs (o: {
src = fetchPypi {
pname = "Flask-SQLAlchemy";
version = "2.5.1";
hash = "sha256-K9pEtD58rLFdTgX/PMH4vJeTbMRkYjQkECv8LDXpWRI=";
};
format = "setuptools";
});
# apache-airflow doesn't work with sqlalchemy 2.x
# https://github.com/apache/airflow/issues/28723
sqlalchemy = pySuper.sqlalchemy.overridePythonAttrs (o: rec {
version = "1.4.48";
src = fetchFromGitHub {
owner = "sqlalchemy";
repo = "sqlalchemy";
rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-qyD3uoxEnD2pdVvwpUlSqHB3drD4Zg/+ov4CzLFIlLs=";
};
});
apache-airflow = pySelf.callPackage ./python-package.nix { };
};
};
in
# See note in ./python-package.nix for
# instructions on manually testing the web UI
with python.pkgs; (toPythonApplication apache-airflow).overrideAttrs (_:{
# Provide access to airflow's modified python package set
# for the cases where external scripts need to import
# airflow modules, though *caveat emptor* because many of
# these packages will not be built by hydra and many will
# not work at all due to the unexpected version overrides
# here.
passthru.pythonPackages = python.pkgs;
})
pkgs/development/python-modules/apache-airflow/package.json → pkgs/servers/apache-airflow/package.json
+23 -5
View File
@@ -9,6 +9,7 @@
"build": "NODE_ENV=production webpack --progress --mode production",
"lint": "eslint --ignore-path=.eslintignore --ext .js,.jsx,.ts,.tsx . && tsc",
"lint:fix": "eslint --fix --ignore-path=.eslintignore --ext .js,.jsx,.ts,.tsx . && tsc",
"format": "yarn prettier --write .",
"generate-api-types": "npx openapi-typescript \"../api_connexion/openapi/v1.yaml\" --output static/js/types/api-generated.ts && node alias-rest-types.js static/js/types/api-generated.ts"
},
"author": "Apache",
@@ -37,13 +38,14 @@
"@babel/preset-typescript": "^7.17.12",
"@testing-library/jest-dom": "^5.16.0",
"@testing-library/react": "^13.0.0",
"@types/color": "^3.0.3",
"@types/react": "^18.0.12",
"@types/react-dom": "^18.0.5",
"@types/react-table": "^7.7.12",
"@typescript-eslint/eslint-plugin": "^5.13.0",
"@typescript-eslint/parser": "^5.0.0",
"babel-jest": "^27.3.1",
"babel-loader": "^8.1.0",
"babel-loader": "^9.1.0",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^6.0.3",
"css-loader": "5.2.7",
@@ -51,8 +53,9 @@
"eslint": "^8.6.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-config-prettier": "^8.6.0",
"eslint-plugin-html": "^6.0.2",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsx-a11y": "^6.5.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
@@ -67,14 +70,16 @@
"moment-locales-webpack-plugin": "^1.2.0",
"nock": "^13.2.4",
"openapi-typescript": "^5.4.1",
"prettier": "^2.8.4",
"style-loader": "^1.2.1",
"stylelint": "^13.6.1",
"stylelint-config-prettier": "^9.0.5",
"stylelint-config-standard": "^20.0.0",
"terser-webpack-plugin": "<5.0.0",
"typescript": "^4.6.3",
"url-loader": "4.1.0",
"web-worker": "^1.2.0",
"webpack": "^5.73.0",
"webpack": "^5.76.0",
"webpack-cli": "^4.0.0",
"webpack-license-plugin": "^4.2.1",
"webpack-manifest-plugin": "^4.0.0"
@@ -93,7 +98,9 @@
"camelcase-keys": "^7.0.0",
"chakra-react-select": "^4.0.0",
"codemirror": "^5.59.1",
"color": "^4.2.3",
"d3": "^3.4.4",
"d3-selection": "^3.0.0",
"d3-shape": "^2.1.0",
"d3-tip": "^0.9.1",
"dagre-d3": "^0.6.4",
@@ -105,16 +112,27 @@
"jquery": ">=3.5.0",
"jshint": "^2.13.4",
"lodash": "^4.17.21",
"moment-timezone": "^0.5.35",
"moment-timezone": "^0.5.43",
"nvd3": "^1.8.6",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-icons": "^4.3.1",
"react-json-view": "^1.21.3",
"react-markdown": "^8.0.4",
"react-query": "^3.39.1",
"react-router-dom": "^6.3.0",
"react-table": "^7.8.0",
"react-textarea-autosize": "^8.3.4",
"reactflow": "^11.4.0",
"redoc": "^2.0.0-rc.72",
"remark-gfm": "^3.0.1",
"swagger-ui-dist": "4.1.3",
"tsconfig-paths": "^3.14.2",
"type-fest": "^2.17.0",
"url-search-params-polyfill": "^8.1.0"
"url-search-params-polyfill": "^8.1.0",
"validator": "^13.9.0"
},
"resolutions": {
"d3-color": "^3.1.0"
}
}
pkgs/servers/apache-airflow/providers.nix
+319
View File
File diff suppressed because one or more lines are too long
pkgs/development/python-modules/apache-airflow/default.nix → pkgs/servers/apache-airflow/python-package.nix
+15 -8
View File
@@ -5,6 +5,7 @@
, fetchFromGitHub
, alembic
, argcomplete
, asgiref
, attrs
, blinker
, cached-property
@@ -48,6 +49,7 @@
, pathspec
, pendulum
, psutil
, pydantic
, pygments
, pyjwt
, python-daemon
@@ -58,6 +60,7 @@
, pythonOlder
, pyyaml
, rich
, rich-argparse
, setproctitle
, sqlalchemy
, sqlalchemy-jsonfield
@@ -68,8 +71,10 @@
, typing-extensions
, unicodecsv
, werkzeug
, pytestCheckHook
, freezegun
, pytest-asyncio
, pytestCheckHook
, time-machine
, mkYarnPackage
, writeScript
@@ -77,7 +82,7 @@
, enabledProviders ? []
}:
let
version = "2.5.1";
version = "2.6.0";
airflow-src = fetchFromGitHub rec {
owner = "apache";
@@ -86,7 +91,7 @@ let
# Download using the git protocol rather than using tarballs, because the
# GitHub archive tarballs don't appear to include tests
forceFetchGit = true;
hash = "sha256-BuJfE6SONTNonUvacOAIdZe0QicdBtx7k186TJZpQOs=";
hash = "sha256-CsLOj68+tSOI7drZq6QH+C2EB/9trg5cFAYAQp/06m8=";
};
# airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree.
@@ -141,6 +146,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
alembic
argcomplete
asgiref
attrs
blinker
cached-property
@@ -183,6 +189,7 @@ buildPythonPackage rec {
pathspec
pendulum
psutil
pydantic
pygments
pyjwt
python-daemon
@@ -192,6 +199,7 @@ buildPythonPackage rec {
python3-openid
pyyaml
rich
rich-argparse
setproctitle
sqlalchemy
sqlalchemy-jsonfield
@@ -212,7 +220,9 @@ buildPythonPackage rec {
nativeCheckInputs = [
freezegun
pytest-asyncio
pytestCheckHook
time-machine
];
# By default, source code of providers is included but unusable due to missing
@@ -223,7 +233,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.cfg \
--replace "colorlog>=4.0.2, <5.0" "colorlog" \
--replace "flask-appbuilder==4.1.4" "flask-appbuilder>=4.1.3" \
--replace "flask-appbuilder==4.3.0" "flask-appbuilder>=4.3.0" \
--replace "pathspec~=0.9.0" "pathspec"
'' + lib.optionalString stdenv.isDarwin ''
# Fix failing test on Hydra
@@ -281,9 +291,6 @@ buildPythonPackage rec {
cd ./pkgs/development/python-modules/apache-airflow
curl -O https://raw.githubusercontent.com/apache/airflow/$new_version/airflow/www/yarn.lock
curl -O https://raw.githubusercontent.com/apache/airflow/$new_version/airflow/www/package.json
# Revert this commit which seems to break with our version of yarn
# https://github.com/apache/airflow/commit/b9e133e40c2848b0d555051a99bf8d2816fd28a7
patch -p3 < 0001-Revert-fix-yarn-warning-from-d3-color-27139.patch
yarn2nix > yarn.nix
# update provider dependencies
@@ -293,7 +300,7 @@ buildPythonPackage rec {
# Note on testing the web UI:
# You can (manually) test the web UI as follows:
#
# nix shell .#python3Packages.apache-airflow
# nix shell .#apache-airflow
# airflow db reset # WARNING: this will wipe any existing db state you might have!
# airflow db init
# airflow standalone
pkgs/development/python-modules/apache-airflow/update-providers.py → pkgs/servers/apache-airflow/update-providers.py
+2 -1
View File
@@ -13,12 +13,13 @@ from urllib.request import urlopen
from urllib.error import HTTPError
import yaml
PKG_SET = "pkgs.python3Packages"
PKG_SET = "apache-airflow.pythonPackages"
# If some requirements are matched by multiple or no Python packages, the
# following can be used to choose the correct one
PKG_PREFERENCES = {
"dnspython": "dnspython",
"elasticsearch-dsl": "elasticsearch-dsl",
"google-api-python-client": "google-api-python-client",
"psycopg2-binary": "psycopg2",
"requests_toolbelt": "requests-toolbelt",
pkgs/development/python-modules/apache-airflow/yarn.lock → pkgs/servers/apache-airflow/yarn.lock
+1669 -275
View File
File diff suppressed because it is too large Load Diff
pkgs/development/python-modules/apache-airflow/yarn.nix → pkgs/servers/apache-airflow/yarn.nix
+1640 -272
View File
File diff suppressed because it is too large Load Diff
pkgs/servers/clickhouse/default.nix
+16 -2
View File
@@ -21,12 +21,26 @@ stdenv.mkDerivation rec {
pname = "clickhouse";
version = "23.3.2.37";
src = fetchFromGitHub {
src = fetchFromGitHub rec {
owner = "ClickHouse";
repo = "ClickHouse";
rev = "v${version}-lts";
fetchSubmodules = true;
sha256 = "sha256-t6aW3wYmD4UajVaUhIE96wCqr6JbOtoBt910nD9IVsk=";
hash = "sha256-G/5KZ4vd9w5g0yB6bzyM8VX3l32Di+a6Ll87NK3GOrg=";
name = "clickhouse-${rev}.tar.gz";
postFetch = ''
# compress to not exceed the 4GB output limit
# try to make a deterministic tarball
tar -I 'gzip -n' \
--sort=name \
--mtime=1970-01-01 \
--owner=root --group=root \
--numeric-owner --mode=go=rX,u+rw,a-s \
--transform='s@^@source/@S' \
-cf temp -C "$out" .
rm -r "$out"
mv temp "$out"
'';
};
strictDeps = true;
pkgs/servers/web-apps/jitsi-meet/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jitsi-meet";
version = "1.0.6943";
version = "1.0.7235";
src = fetchurl {
url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";
sha256 = "4swWsCo6PmMzvSVY6vS5n2HH8o6pU+Ak37ng18BLqIk=";
sha256 = "OlAInpGl6I5rKgIsO3nXUQfksU326lsSDdiZdCYM3NU=";
};
dontBuild = true;
pkgs/tools/networking/speedtest-go/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "speedtest-go";
version = "1.6.2";
version = "1.6.3";
src = fetchFromGitHub {
owner = "showwin";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-UUWchOOI4Mp6nykcsLYiDB+PCsM7k/3aYSBGizdLmP8=";
hash = "sha256-xZq7wiD0H6W7BeOQoTkWVmFM1dV24clJUibNaW0lLwk=";
};
vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E=";
pkgs/top-level/all-packages.nix
+10 -11
View File
@@ -1457,7 +1457,7 @@ with pkgs;
airgeddon = callPackage ../tools/networking/airgeddon { };
apache-airflow = with python3.pkgs; toPythonApplication apache-airflow;
apache-airflow = callPackage ../servers/apache-airflow { };
apachetomcatscanner = callPackage ../tools/security/apachetomcatscanner { };
@@ -18186,6 +18186,8 @@ with pkgs;
coder = callPackage ../development/tools/coder { };
codespelunker = callPackage ../development/tools/codespelunker { };
compile-daemon = callPackage ../development/tools/compile-daemon { };
complexity = callPackage ../development/tools/misc/complexity { };
@@ -19659,7 +19661,6 @@ with pkgs;
ycmd = callPackage ../development/tools/misc/ycmd {
inherit (darwin.apple_sdk.frameworks) Cocoa;
python = python3;
boost = boost174;
};
yodl = callPackage ../development/tools/misc/yodl { };
@@ -20123,9 +20124,7 @@ with pkgs;
cpp-ipfs-http-client = callPackage ../development/libraries/cpp-ipfs-http-client { };
cpp-netlib = callPackage ../development/libraries/cpp-netlib {
boost = boost169; # fatal error: 'boost/asio/stream_socket_service.hpp' file not found
};
cpp-netlib = callPackage ../development/libraries/cpp-netlib { };
cpp-jwt = callPackage ../development/libraries/cpp-jwt { };
@@ -21698,6 +21697,8 @@ with pkgs;
libcrossguid = callPackage ../development/libraries/libcrossguid { };
libcs50 = callPackage ../development/libraries/libcs50 { };
libuchardet = callPackage ../development/libraries/libuchardet { };
libchop = callPackage ../development/libraries/libchop { };
@@ -22223,9 +22224,7 @@ with pkgs;
librevenge = callPackage ../development/libraries/librevenge { };
librime = callPackage ../development/libraries/librime {
boost = boost174;
};
librime = callPackage ../development/libraries/librime { };
librsb = callPackage ../development/libraries/librsb {
# Taken from https://build.opensuse.org/package/view_file/science/librsb/librsb.spec
@@ -22422,9 +22421,7 @@ with pkgs;
libndctl = callPackage ../development/libraries/libndctl { };
libnest2d = callPackage ../development/libraries/libnest2d {
boost = boost174;
};
libnest2d = callPackage ../development/libraries/libnest2d { };
libnet = callPackage ../development/libraries/libnet { };
@@ -31827,6 +31824,8 @@ with pkgs;
irssi = callPackage ../applications/networking/irc/irssi { };
filebrowser = callPackage ../applications/networking/filebrowser { };
fish-irssi = callPackage ../applications/networking/irc/irssi/fish { };
kirc = callPackage ../applications/networking/irc/kirc { };
pkgs/top-level/python-aliases.nix
+1
View File
@@ -41,6 +41,7 @@ mapAliases ({
ansible-later = throw "ansible-later has been promoted to a top-level attribute"; # Added 2023-05-16
ansible-lint = throw "ansible-lint has been promoted to a top-level attribute"; # Added 2023-05-16
anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
apache-airflow = throw "apache-airflow has been moved out of pythonPackages and is available as a standalone package"; # added 2023-06-05
argon2_cffi = argon2-cffi; # added 2022-05-09
APScheduler = apscheduler; # added 2023-02-19
asyncio-nats-client = nats-py; # added 2022-02-08
pkgs/top-level/python-packages.nix
+4 -2
View File
@@ -536,8 +536,6 @@ self: super: with self; {
aocd = callPackage ../development/python-modules/aocd { };
apache-airflow = callPackage ../development/python-modules/apache-airflow { };
apache-beam = callPackage ../development/python-modules/apache-beam { };
apcaccess = callPackage ../development/python-modules/apcaccess { };
@@ -612,6 +610,8 @@ self: super: with self; {
argparse-addons = callPackage ../development/python-modules/argparse-addons { };
argparse-dataclass = callPackage ../development/python-modules/argparse-dataclass { };
args = callPackage ../development/python-modules/args { };
aria2p = callPackage ../development/python-modules/aria2p { };
@@ -10633,6 +10633,8 @@ self: super: with self; {
rich = callPackage ../development/python-modules/rich { };
rich-argparse = callPackage ../development/python-modules/rich-argparse { };
rich-argparse-plus = callPackage ../development/python-modules/rich-argparse-plus { };
rich-click = callPackage ../development/python-modules/rich-click { };