diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-04-11 12:01:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-11 12:01:14 +0000 |
| commit | 3c070a08ff5e8646f15398ff7e257d91b97ac5da (patch) | |
| tree | 0f5755105d2183d7cdb30a453c71e2753c023302 /pkgs | |
| parent | 019a8d20638d5468e84bc0d49f7e53ab1ed3e91e (diff) | |
| parent | 6d468c3a2e5cdf150672044a771fad89077bb8e5 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs')
63 files changed, 1517 insertions, 524 deletions
diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 8fa0a8e7576f5..294d77404a3fd 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2023.03.05-5"; + version = "2023.04.02-7"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - sha256 = "sha256-PfudozmrL8jNS/99nxSn0B3E53W34m4/ZN0y2ucB2WI="; + sha256 = "sha256-xXBzHo7IOo2f1raGnpFcsvs++crHMI5SACIc345cX7g="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/irc/senpai/default.nix b/pkgs/applications/networking/irc/senpai/default.nix index d5a977f65fbe5..3e87b2aa1dafb 100644 --- a/pkgs/applications/networking/irc/senpai/default.nix +++ b/pkgs/applications/networking/irc/senpai/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "senpai"; - version = "unstable-2023-02-13"; + version = "0.2.0"; src = fetchFromSourcehut { owner = "~taiite"; repo = "senpai"; - rev = "1318e784bd2bba3765aee97811a3f0053d3a6723"; + rev = "v${version}"; sha256 = "sha256-q167og8S8YbLcREZ7DVbJhjMzx4iO0WgIFkOV2IpieM="; }; @@ -30,7 +30,7 @@ buildGoModule rec { meta = with lib; { description = "Your everyday IRC student"; - homepage = "https://ellidri.org/senpai"; + homepage = "https://sr.ht/~taiite/senpai/"; license = licenses.isc; maintainers = with maintainers; [ malte-v ]; }; diff --git a/pkgs/data/themes/sweet-nova/default.nix b/pkgs/data/themes/sweet-nova/default.nix new file mode 100644 index 0000000000000..5c89964eeaf6d --- /dev/null +++ b/pkgs/data/themes/sweet-nova/default.nix @@ -0,0 +1,51 @@ +{ fetchFromGitHub +, gitUpdater +, lib +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation { + pname = "sweet-nova"; + version = "unstable-2023-04-02"; + + src = fetchFromGitHub { + owner = "EliverLara"; + repo = "Sweet"; + rev = "8a5d5a7d975567b5ae101b9f9d436fb1db2d9b24"; + hash = "sha256-FVcXBxcS5oFsvAUDcwit7EIfgIQznl8AYYxqQ797ddU="; + }; + + buildPhase = '' + runHook preBuild + cd kde + mkdir -p aurorae/themes + mv aurorae/Sweet-Dark aurorae/themes/Sweet-Dark + mv aurorae/Sweet-Dark-transparent aurorae/themes/Sweet-Dark-transparent + rm aurorae/.shade.svg + mv colorschemes color-schemes + mkdir -p plasma/look-and-feel + mv look-and-feel plasma/look-and-feel/com.github.eliverlara.sweet + mv sddm sddm-Sweet + mkdir -p sddm/themes + mv sddm-Sweet sddm/themes/Sweet + mv cursors icons + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -d $out/share + cp -r Kvantum aurorae color-schemes icons konsole plasma sddm $out/share + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "A dark and colorful, blurry theme for the KDE Plasma desktop"; + homepage = "https://github.com/EliverLara/Sweet"; + license = licenses.gpl3Only; + maintainers = [ maintainers.dr460nf1r3 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index d21f994a43afe..b3d6f8262432f 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -122,6 +122,15 @@ super: lib.trivial.pipe super [ ]; })) + (patchExtension "Vitals@CoreCoding.com" (old: { + patches = [ + (substituteAll { + src = ./extensionOverridesPatches/vitals_at_corecoding.com.patch; + gtop_path = "${libgtop}/lib/girepository-1.0"; + }) + ]; + })) + (patchExtension "unite@hardpixel.eu" (old: { buildInputs = [ xprop ]; diff --git a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/vitals_at_corecoding.com.patch b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/vitals_at_corecoding.com.patch new file mode 100644 index 0000000000000..b3716529f89a1 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/vitals_at_corecoding.com.patch @@ -0,0 +1,14 @@ +diff --git i/sensors.js w/sensors.js +index 5ab7068..00cfa19 100644 +--- i/sensors.js ++++ w/sensors.js +@@ -29,6 +29,9 @@ const Me = imports.misc.extensionUtils.getCurrentExtension(); + const FileModule = Me.imports.helpers.file; + const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); + const _ = Gettext.gettext; ++ ++imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@'); ++ + const NM = imports.gi.NM; + + let GTop, hasGTop = true; diff --git a/pkgs/development/compilers/chicken/5/deps.toml b/pkgs/development/compilers/chicken/5/deps.toml index 33fb212d409ab..6b0cad35b05d0 100644 --- a/pkgs/development/compilers/chicken/5/deps.toml +++ b/pkgs/development/compilers/chicken/5/deps.toml @@ -70,7 +70,7 @@ synopsis = "SRFI-69-like library for alists" version = "0.3.0" [allegro] -dependencies = [] +dependencies = ["foreigners"] license = "bsd" sha256 = "14w7q0iwskrqbqfjspf5wxnxb8wn56q9xbpc0vz518azm9ndf63p" synopsis = "Allegro" @@ -98,7 +98,7 @@ synopsis = "Some anaphoric and named macros" version = "1.0.1" [ansi-escape-sequences] -dependencies = [] +dependencies = ["srfi-1"] license = "bsd" sha256 = "1693zqbcva4h3562x3hmy7xpijc20yv1bmglz1hzr8jfm30hrc2p" synopsis = "Procedures to generate ANSI escape sequences" @@ -205,9 +205,9 @@ version = "0.1.6" [awful] dependencies = ["json", "http-session", "spiffy", "spiffy-cookies", "spiffy-request-vars", "sxml-transforms", "srfi-1", "srfi-13", "srfi-69"] license = "bsd" -sha256 = "009z3222qfvddlkxkjip64hn3k448a3nd6fxa9657mmrrcyhmwx6" +sha256 = "1i20ib8kx2hjggi18xn72lwxaa2q38bmmffsm06s1cxrfh58s5gz" synopsis = "awful provides an application and an extension to ease the development of web-based applications." -version = "1.0.2" +version = "1.0.3" [base64] dependencies = ["srfi-13"] @@ -217,14 +217,14 @@ synopsis = "Encoding and decoding of base64 strings" version = "1.0" [beaker] -dependencies = ["begin-syntax", "debugger-protocol", "schematic", "srfi-1", "srfi-13", "srfi-14", "srfi-69", "vector-lib", "with-current-directory"] +dependencies = ["begin-syntax", "debugger-protocol", "schematic", "srfi-1", "srfi-13", "srfi-14", "srfi-69", "vector-lib", "with-current-directory", "module-declarations"] license = "bsd" sha256 = "0clfw7z2j3b6hyj78g61n7nxf07bcksvdcbgs3jiv99rr1vaj9z5" synopsis = "Lab supplies for CHICKEN development" version = "0.0.20" [begin-syntax] -dependencies = ["matchable"] +dependencies = ["matchable", "module-declarations"] license = "bsd" sha256 = "10xdikbpilxibjvmdnshjdwhp56lh0w6414cwgiwva2vqr7930zj" synopsis = "Convenience macro for inline syntax expansion" @@ -287,7 +287,7 @@ synopsis = "Bitwise utilities" version = "1.2.5" [blas] -dependencies = ["bind"] +dependencies = ["bind", "compile-file", "srfi-13"] license = "bsd" sha256 = "1gx22ycqc3jpcmv16644ay9cygh535di4j7znqjqxn2dyq29dmkm" synopsis = "An interface to level 1, 2 and 3 BLAS routines" @@ -308,7 +308,7 @@ synopsis = "Bloom Filter" version = "2.3.1" [blosc] -dependencies = [] +dependencies = ["srfi-13", "compile-file"] license = "bsd" sha256 = "0m78rb2q0znixpiflcrndlk708g4mbw7yh1ynkvk3zzvln0d3wgi" synopsis = "Bindings to the Blosc multi-threaded meta-compressor library" @@ -602,7 +602,7 @@ synopsis = "Computes CRC checksum" version = "1.0.2" [crypt] -dependencies = [] +dependencies = ["compile-file"] license = "public-domain" sha256 = "1x7il9qz6m8kicgz57iw2yykfn9x6pa56m33rp5z70z4yfkrxqwz" synopsis = "Secure password hashing through the Unix crypt() function" @@ -749,7 +749,7 @@ synopsis = "lambda equivalents with dots as trailing symbols" version = "1.3.1" [dust] -dependencies = ["http-client", "memory-mapped-files", "openssl", "posix-groups"] +dependencies = ["http-client", "memory-mapped-files", "openssl", "posix-groups", "begin-syntax", "matchable", "module-declarations"] license = "bsd" sha256 = "1invlk61z32x3f834qapwbqbjab04153c5rs06gaqa6ip83mraj6" synopsis = "Fetch and install CHICKEN versions" @@ -994,7 +994,7 @@ synopsis = "Interface based sequence library" version = "0.9" [fuse] -dependencies = ["srfi-18"] +dependencies = ["srfi-18", "foreigners", "matchable", "module-declarations"] license = "bsd" sha256 = "1ywgjrhkr45837xf5vnb2i3aacby7yjkhm62drdf70c09za860dd" synopsis = "Filesystems in Userspace" @@ -1078,7 +1078,7 @@ synopsis = "Utilities for getopt-long" version = "1.0.1" [git] -dependencies = ["srfi-69"] +dependencies = ["srfi-69", "foreigners", "module-declarations", "srfi-1"] license = "bsd" sha256 = "0cgab5wbcqqcxx771xvbyd06c3dz3ib8v2mpv21d2z6b48c9qin8" synopsis = "libgit2 bindings" @@ -1260,7 +1260,7 @@ synopsis = "High-level HTTP client library" version = "1.2.1" [http-session] -dependencies = [] +dependencies = ["intarweb", "simple-sha1", "spiffy", "srfi-1", "srfi-18", "srfi-69", "uri-common"] license = "bsd" sha256 = "1yjzkax2m3jz05640la0ry11vafrqwdhn2sd1jr0w8yhgbwwfprs" synopsis = "Facilities for managing HTTP sessions" @@ -1386,7 +1386,7 @@ synopsis = "A simple IRC client" version = "1.9.9" [isaac] -dependencies = [] +dependencies = ["module-declarations"] license = "bsd" sha256 = "0hmqm5ag457q0zryaj8b2zx25hgg9pq4l1gxd5vf4xb4s79i1wxb" synopsis = "Bindings to the ISAAC CSPRNG" @@ -1554,14 +1554,14 @@ synopsis = "Expands LLRB code customized to data structures." version = "0.2" [llrb-tree] -dependencies = ["srfi-128", "miscmacros"] +dependencies = ["srfi-128", "miscmacros", "llrb-syntax"] license = "bsd" sha256 = "13qsba89mra5bs2gsv313dy6gvm3mzccl31gjh41wyk81xzaq434" synopsis = "LLRB tree general and customized to key types." version = "0.3.8" [lmdb-ht] -dependencies = ["rabbit", "srfi-69"] +dependencies = ["rabbit", "srfi-69", "srfi-13", "compile-file"] license = "bsd" sha256 = "1ragkv9xpgsq9lfz0p6aknw54m4rynby2vq6xlhrlhwwq0g5v1ld" synopsis = "Hashtable-like interface to the LMDB key-value database." @@ -1745,9 +1745,9 @@ version = "4.3.8" [message-digest-type] dependencies = ["blob-utils", "string-utils", "message-digest-primitive", "check-errors"] license = "bsd" -sha256 = "0f0jq6g74xlixdfgz8hp0xpm5jzl7cjihs8sa62rdf4xj172pzp6" +sha256 = "0njvcflhafs5pqvhnm31alp66v1szg2y08fdlwnwq2bzzpaq83id" synopsis = "Message Digest Type" -version = "4.3.4" +version = "4.3.5" [message-digest-utils] dependencies = ["blob-utils", "string-utils", "memory-mapped-files", "message-digest-primitive", "message-digest-type", "check-errors"] @@ -1841,7 +1841,7 @@ synopsis = "Interface to Music Player Daemon" version = "2.1" [mpi] -dependencies = ["srfi-1", "srfi-13", "srfi-14"] +dependencies = ["srfi-1", "srfi-13", "srfi-14", "srfi-1", "compile-file"] license = "gpl-3" sha256 = "0ca91ny4cqgd69f62l0slg8f9dvnchy6c289nmik7wnnr8ns1g13" synopsis = "Message-passing Interface (MPI)" @@ -1876,7 +1876,7 @@ synopsis = "Natural sorting procedures" version = "1.1" [ncurses] -dependencies = [] +dependencies = ["bind"] license = "bsd" sha256 = "1cdkicn3zmb8vcnqwd4rk19ywc7kfj3zsmi2wl6g41b4gdyd3xw8" synopsis = "An interface to the UNIX ncurses package" @@ -2030,14 +2030,14 @@ synopsis = "Wrapper around pkg-config" version = "0.1.2" [pledge] -dependencies = [] +dependencies = ["module-declarations"] license = "bsd" sha256 = "1fj53zvsld6n2sasp3lwnjxsmn11z5zf53928gygh6rb84mfhq22" synopsis = "Bindings for OpenBSD's pledge(2)" version = "0.1.0" [plot] -dependencies = ["srfi-1", "srfi-13", "datatype", "matchable"] +dependencies = ["srfi-1", "srfi-13", "datatype", "matchable", "compile-file"] license = "gpl-3" sha256 = "12f0jrj0xhaj6yggf8d89iqznc30j4bhivl25p5b4vrdkd4mac2v" synopsis = "An interface to GNU libplot, a library for device-independent two-dimensional vector graphics." @@ -2051,7 +2051,7 @@ synopsis = "Access POSIX group information" version = "0.2.1" [posix-mq] -dependencies = ["srfi-1"] +dependencies = ["srfi-1", "compile-file"] license = "bsd" sha256 = "19la5grxxrlx853kcgnr47987yrrbmh1l5kbs5x6absj45ivzllk" synopsis = "POSIX message queues API" @@ -2065,7 +2065,7 @@ synopsis = "A thin wrapper around POSIX regular expression matching" version = "0.1.0" [posix-shm] -dependencies = ["srfi-1"] +dependencies = ["srfi-1", "compile-file"] license = "bsd" sha256 = "12rljfwpq1jax439jhcvmyjz6ijra1wis8nysi0sbnmdzlm3w3gd" synopsis = "POSIX shared memory API" @@ -2156,7 +2156,7 @@ synopsis = "A command-line-based password manager" version = "1.4" [pyffi] -dependencies = ["srfi-1", "srfi-69", "bind", "utf8"] +dependencies = ["srfi-1", "srfi-69", "bind", "utf8", "compile-file", "pkg-config", "srfi-13"] license = "gpl-3" sha256 = "1a62kd4qscl16hqmbj94yvnwhfgh5dkpqkrrlpw9pa0ngfb8854v" synopsis = "An interface to the Python programming language." @@ -2345,7 +2345,7 @@ synopsis = "A tool to generate atom feeds out of salmonella log files" version = "0.1.1" [salmonella-html-report] -dependencies = [] +dependencies = ["salmonella", "srfi-1", "srfi-13", "sxml-transforms"] license = "bsd" sha256 = "107n7sgzk91s25ih3k40y649fnv9n37xnf7igkkn5c642hjmfr6d" synopsis = "A tool to generate HTML ouput out of salmonella log files" @@ -2660,7 +2660,7 @@ synopsis = "Lightweight, simple library for loading image files into OpenGL-frie version = "1.6.0" [sourcehut] -dependencies = ["http-client", "intarweb", "medea", "openssl", "optimism", "simple-exceptions", "srfi-1", "srfi-133"] +dependencies = ["http-client", "intarweb", "medea", "openssl", "optimism", "simple-exceptions", "srfi-1", "srfi-133", "begin-syntax", "module-declarations"] license = "bsd" sha256 = "1l7cc6kynh54qanqr8z8v38b7c3whb79hsdrdia5cvxcig2vzvfk" synopsis = "Bindings and CLI for the sr.ht REST API" @@ -2688,7 +2688,7 @@ synopsis = "Procedures for managing cookies" version = "1.2" [spiffy-directory-listing] -dependencies = [] +dependencies = ["spiffy", "sxml-transforms"] license = "bsd" sha256 = "1jpvskqc2vx7f01vc4wj3kl2kqb53b6x33xm6qi6v947k8has49y" synopsis = "Flexible directory listing for Spiffy" @@ -2730,7 +2730,7 @@ synopsis = "A compiler and runtime system for R5RS Scheme on top of JavaScript" version = "0.2" [sq] -dependencies = ["optimism", "r7rs", "simple-exceptions", "srfi-18", "srfi-60", "srfi-145"] +dependencies = ["optimism", "r7rs", "simple-exceptions", "srfi-18", "srfi-60", "srfi-145", "begin-syntax", "matchable", "miscmacros", "module-declarations"] license = "bsd" sha256 = "0pcxy8l8qlb085pbxp9plxzzrs4wb2pfpx840rydwhpsjmrfx1zp" synopsis = "Scheme jq wrapper for processing S-expressions" @@ -3003,7 +3003,7 @@ synopsis = "SRFI-18 thread library" version = "0.1.6" [srfi-180] -dependencies = ["r7rs", "srfi-60", "srfi-145"] +dependencies = ["r7rs", "srfi-60", "srfi-145", "srfi-121"] license = "mit" sha256 = "0agky55bn26967nqcaa3n2a3rsr79brybizcivh34qna15gahq39" synopsis = "This library describes a JavaScript Object Notation (JSON) parser and printer. It supports JSON that may be bigger than memory." @@ -3019,9 +3019,9 @@ version = "1.0.3" [srfi-19] dependencies = ["srfi-1", "utf8", "srfi-18", "srfi-29", "srfi-69", "miscmacros", "locale", "record-variants", "check-errors"] license = "bsd" -sha256 = "0avkqifrl4w0v4zrqgigwxg91nqvzriac61725x5lb662rswpg2b" +sha256 = "02348j6zdp1nyh0f8jw1j848qlm0dv7p7q6rw7jdfzqi4bq5myva" synopsis = "Time Data Types and Procedures" -version = "4.7.1" +version = "4.7.2" [srfi-193] dependencies = [] @@ -3145,9 +3145,9 @@ version = "1.5" [srfi-41] dependencies = ["srfi-1", "record-variants", "check-errors"] license = "bsd" -sha256 = "1g9cmfhfagrgpgfc2q55q0bd9bqxdzj35cvawqngk9flnkpanbh7" +sha256 = "017qpy23mq2h7pd70j5wgq570z29qpnl8fw0j272kr6g5ndhmbbp" synopsis = "SRFI 41 (Streams)" -version = "2.1.4" +version = "2.1.5" [srfi-42] dependencies = ["srfi-1", "srfi-13"] @@ -3304,7 +3304,7 @@ synopsis = "Simple Finite State Machine library" version = "1.0" [statistics] -dependencies = ["srfi-1", "srfi-25", "srfi-69", "vector-lib", "random-mtzig", "yasos"] +dependencies = ["srfi-1", "srfi-25", "srfi-69", "vector-lib", "random-mtzig", "yasos", "compile-file", "srfi-13"] license = "gpl-3" sha256 = "0s659vg9na72brl1bs336vbv7jxy3blf113mifax7ya5vpvxnl71" synopsis = "Statistics library" @@ -3367,7 +3367,7 @@ synopsis = "stty-style interface to termios" version = "0.6" [sundials] -dependencies = ["srfi-1", "srfi-69"] +dependencies = ["srfi-1", "srfi-69", "srfi-13", "compile-file"] license = "bsd" sha256 = "0v9bxclbm11glbv47pqbwi2gxx9555c04njy1cxigs6wyrvg54yh" synopsis = "An interface to SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers)." @@ -3577,7 +3577,7 @@ synopsis = "A Chicken binding to read TOML configuration files" version = "0.7" [topham] -dependencies = ["http-client", "intarweb", "medea", "openssl", "optimism", "simple-exceptions", "srfi-1"] +dependencies = ["http-client", "intarweb", "medea", "openssl", "optimism", "simple-exceptions", "srfi-1", "module-declarations"] license = "bsd" sha256 = "18p3gjbzi95djyn1rm230ag5g4n4q70pqi670b215icjx91za63i" synopsis = "Bindings for the sr.ht REST API" @@ -3731,11 +3731,11 @@ synopsis = "Unicode support" version = "3.6.3" [uuid-lib] -dependencies = [] +dependencies = ["record-variants"] license = "bsd" -sha256 = "1vq5k5cblhx03a79mbs2903c0lwq526zcjxk8da09cccvf7xqf33" +sha256 = "1788c9wilnwa21r27g9cfwjypbzgmv6rs5i93yrywg2fry9v45nd" synopsis = "OSF DCE 1.1 UUID" -version = "0.0.1" +version = "0.0.9" [uuid] dependencies = [] @@ -3780,7 +3780,7 @@ synopsis = "Multi-platform HTML user interface shell" version = "1.0.1" [with-current-directory] -dependencies = [] +dependencies = ["module-declarations"] license = "bsd" sha256 = "1ryl7l2jw5m34fmvv1nr0rf2mwkxrds8xkz7msfzi4gy36i5zja9" synopsis = "Convenience procedure for temporarily changing directories" diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix index 23c48ced26679..8a558a605bfb9 100644 --- a/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix @@ -27,19 +27,22 @@ in export CHICKEN_INSTALL_PREFIX=$out export CHICKEN_INSTALL_REPOSITORY=$out/lib/chicken/${toString chicken.binaryVersion} - chicken-install ${lib.concatStringsSep " " chickenInstallFlags} + chicken-install -cached ${lib.concatStringsSep " " chickenInstallFlags} for f in $out/bin/* do wrapProgram $f \ - --prefix CHICKEN_REPOSITORY_PATH : "$out/lib/chicken/${toString chicken.binaryVersion}:$CHICKEN_REPOSITORY_PATH" \ - --prefix CHICKEN_INCLUDE_PATH : "$CHICKEN_INCLUDE_PATH:$out/share" \ + --prefix CHICKEN_REPOSITORY_PATH : "$out/lib/chicken/${toString chicken.binaryVersion}" \ + --suffix CHICKEN_INCLUDE_PATH : "$out/share" \ --prefix PATH : "$out/bin:${chicken}/bin:$CHICKEN_REPOSITORY_PATH" done runHook postInstall ''; + dontBuild = true; + dontConfigure = true; + meta = { inherit (chicken.meta) platforms; } // args.meta or {}; diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 4c286b59be079..eadd7ef87afd5 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, chickenEggs }: +{ stdenv, pkgs, lib, chickenEggs }: let addToBuildInputs = pkg: old: { buildInputs = (old.buildInputs or [ ]) ++ lib.toList pkg; @@ -14,18 +14,25 @@ let (addPkgConfig old) // (addToBuildInputs pkg old); addToPropagatedBuildInputsWithPkgConfig = pkg: old: (addPkgConfig old) // (addToPropagatedBuildInputs pkg old); + brokenOnDarwin = old: { meta = old.meta // { broken = stdenv.isDarwin; }; }; in { + allegro = addToBuildInputsWithPkgConfig [ pkgs.allegro5 pkgs.libglvnd ]; breadline = addToBuildInputs pkgs.readline; + blas = addToBuildInputsWithPkgConfig pkgs.blas; + blosc = addToBuildInputs pkgs.c-blosc; cairo = old: (addToBuildInputsWithPkgConfig pkgs.cairo old) // (addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 srfi-13 ]) old); cmark = addToBuildInputs pkgs.cmark; dbus = addToBuildInputsWithPkgConfig pkgs.dbus; epoxy = addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy; - exif = addToBuildInputs pkgs.libexif; + espeak = addToBuildInputsWithPkgConfig pkgs.espeak-ng; + exif = old: (brokenOnDarwin old) // (addToBuildInputs pkgs.libexif old); expat = addToBuildInputs pkgs.expat; ezxdisp = addToBuildInputsWithPkgConfig pkgs.xorg.libX11; freetype = addToBuildInputs pkgs.freetype; + fuse = addToBuildInputsWithPkgConfig pkgs.fuse; + git = addToBuildInputsWithPkgConfig pkgs.libgit2; glfw3 = addToBuildInputsWithPkgConfig pkgs.glfw3; icu = addToBuildInputsWithPkgConfig pkgs.icu; imlib2 = addToBuildInputsWithPkgConfig pkgs.imlib2; @@ -34,16 +41,23 @@ in { magic = addToBuildInputs pkgs.file; mdh = addToBuildInputs pkgs.pcre; nanomsg = addToBuildInputs pkgs.nanomsg; + ncurses = addToBuildInputsWithPkgConfig [ pkgs.ncurses ]; + opencl = addToBuildInputs [ pkgs.opencl-headers pkgs.ocl-icd ]; + opengl = addToBuildInputsWithPkgConfig [ pkgs.libGL pkgs.libGLU ]; openssl = addToBuildInputs pkgs.openssl; + plot = addToBuildInputs pkgs.plotutils; + postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql; rocksdb = addToBuildInputs pkgs.rocksdb; sdl-base = addToBuildInputs pkgs.SDL; sdl2 = addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2; sdl2-image = addToBuildInputs pkgs.SDL2_image; sdl2-ttf = addToBuildInputs pkgs.SDL2_ttf; + soil = addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy; sqlite3 = addToBuildInputs pkgs.sqlite; - stemmer = addToBuildInputs pkgs.libstemmer; + stemmer = old: (brokenOnDarwin old) // (addToBuildInputs pkgs.libstemmer old); stfl = addToBuildInputs [ pkgs.ncurses pkgs.stfl ]; - taglib = addToBuildInputs [ pkgs.zlib pkgs.taglib ]; + taglib = old: + (brokenOnDarwin old) // (addToBuildInputs [ pkgs.zlib pkgs.taglib ] old); uuid-lib = addToBuildInputs pkgs.libuuid; ws-client = addToBuildInputs pkgs.zlib; xlib = addToPropagatedBuildInputs pkgs.xorg.libX11; @@ -55,4 +69,11 @@ in { # platform changes pledge = old: { meta = old.meta // { platforms = lib.platforms.openbsd; }; }; unveil = old: { meta = old.meta // { platforms = lib.platforms.openbsd; }; }; + + # mark broken + F-operator = old: { meta = old.meta // { broken = true; }; }; + comparse = old: { meta = old.meta // { broken = true; }; }; + kiwi = old: { meta = old.meta // { broken = true; }; }; + qt-light = old: { meta = old.meta // { broken = true; }; }; + stty = brokenOnDarwin; } diff --git a/pkgs/development/compilers/chicken/5/read-egg.scm b/pkgs/development/compilers/chicken/5/read-egg.scm index 28f2e4e41c8b8..b5e3d5c3d05aa 100755 --- a/pkgs/development/compilers/chicken/5/read-egg.scm +++ b/pkgs/development/compilers/chicken/5/read-egg.scm @@ -14,7 +14,10 @@ (->string (if (list? dep) (car dep) dep))) - (ref 'dependencies egg eqv? '()))) + (append + (ref 'dependencies egg eqv? '()) + ;; TODO separate this into `buildInputs` and `propagatedBuildInputs` + (ref 'build-dependencies egg eqv? '())))) (printf "dependencies = [~A]\n" (string-intersperse (map (lambda (dep) (sprintf "~S" dep)) dependencies) diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index fe230c93918ae..02baf6227d91c 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -217,6 +217,19 @@ in lib.makeScope pkgs.newScope (self: with self; { }; }; + elm-spa = nodePkgs."elm-spa".overrideAttrs ( + old: { + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ makeWrapper old.nodejs.pkgs.node-gyp-build ]; + + meta = with lib; nodePkgs."elm-spa".meta // { + description = "A tool for building single page apps in Elm"; + homepage = "https://www.elm-spa.dev/"; + license = licenses.bsd3; + maintainers = [ maintainers.ilyakooo0 ]; + }; + } + ); + elm-optimize-level-2 = nodePkgs."elm-optimize-level-2" // { meta = with lib; nodePkgs."elm-optimize-level-2".meta // { description = "A second level of optimization for the Javascript that the Elm Compiler produces"; diff --git a/pkgs/development/compilers/elm/packages/node-packages.json b/pkgs/development/compilers/elm/packages/node-packages.json index d131bf236246f..6b3f7b585173e 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.json +++ b/pkgs/development/compilers/elm/packages/node-packages.json @@ -4,6 +4,7 @@ "elm-doc-preview", "@elm-tooling/elm-language-server", "elm-live", + "elm-spa", "elm-test", "elm-upgrade", "elm-verify-examples", diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index 56550436c97ae..c3ff7bf83cf57 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -22,22 +22,22 @@ let sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; }; }; - "@babel/code-frame-7.18.6" = { + "@babel/code-frame-7.21.4" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.18.6"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"; - sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz"; + sha512 = "LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g=="; }; }; - "@babel/compat-data-7.21.0" = { + "@babel/compat-data-7.21.4" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.21.0"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz"; - sha512 = "gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.4.tgz"; + sha512 = "/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g=="; }; }; "@babel/core-7.12.10" = { @@ -49,13 +49,13 @@ let sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; - "@babel/generator-7.21.1" = { + "@babel/generator-7.21.4" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.21.1"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz"; - sha512 = "1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.21.4.tgz"; + sha512 = "NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -76,31 +76,31 @@ let sha512 = "yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw=="; }; }; - "@babel/helper-compilation-targets-7.20.7" = { + "@babel/helper-compilation-targets-7.21.4" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.20.7"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz"; - sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz"; + sha512 = "Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg=="; }; }; - "@babel/helper-create-class-features-plugin-7.21.0" = { + "@babel/helper-create-class-features-plugin-7.21.4" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.21.0"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.0.tgz"; - sha512 = "Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz"; + sha512 = "46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.21.0" = { + "@babel/helper-create-regexp-features-plugin-7.21.4" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.21.0"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.0.tgz"; - sha512 = "N+LaFW/auRSWdx7SHD/HiARwXQju1vXTW4fKr4u5SgBUTm51OKEjKgj+cs00ggW3kEvNqwErnlwuq7Y3xBe4eg=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.4.tgz"; + sha512 = "M00OuhU+0GyZ5iBBN9czjugzWrEq2vDpf/zCYHxxf93ul/Q5rv+a5h+/+0WnI1AebHNVtl5bFV0qsJoH23DbfA=="; }; }; "@babel/helper-environment-visitor-7.18.9" = { @@ -148,13 +148,13 @@ let sha512 = "Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q=="; }; }; - "@babel/helper-module-imports-7.18.6" = { + "@babel/helper-module-imports-7.21.4" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.18.6"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"; - sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz"; + sha512 = "orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg=="; }; }; "@babel/helper-module-transforms-7.21.2" = { @@ -283,13 +283,13 @@ let sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.21.2" = { + "@babel/parser-7.21.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.21.2"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz"; - sha512 = "URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz"; + sha512 = "alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.20.7" = { @@ -571,13 +571,13 @@ let sha512 = "Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ=="; }; }; - "@babel/plugin-transform-destructuring-7.20.7" = { + "@babel/plugin-transform-destructuring-7.21.3" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.20.7"; + version = "7.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz"; - sha512 = "Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz"; + sha512 = "bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA=="; }; }; "@babel/plugin-transform-dotall-regex-7.18.6" = { @@ -706,13 +706,13 @@ let sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; }; }; - "@babel/plugin-transform-parameters-7.20.7" = { + "@babel/plugin-transform-parameters-7.21.3" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.20.7"; + version = "7.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz"; - sha512 = "WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz"; + sha512 = "Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ=="; }; }; "@babel/plugin-transform-property-literals-7.18.6" = { @@ -859,22 +859,22 @@ let sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; }; - "@babel/traverse-7.21.2" = { + "@babel/traverse-7.21.4" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.21.2"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.2.tgz"; - sha512 = "ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.4.tgz"; + sha512 = "eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q=="; }; }; - "@babel/types-7.21.2" = { + "@babel/types-7.21.4" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.21.2"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.21.2.tgz"; - sha512 = "3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.21.4.tgz"; + sha512 = "rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA=="; }; }; "@hapi/address-2.1.4" = { @@ -922,13 +922,13 @@ let sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; }; }; - "@jridgewell/gen-mapping-0.3.2" = { + "@jridgewell/gen-mapping-0.3.3" = { name = "_at_jridgewell_slash_gen-mapping"; packageName = "@jridgewell/gen-mapping"; - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"; - sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz"; + sha512 = "HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ=="; }; }; "@jridgewell/resolve-uri-3.1.0" = { @@ -949,13 +949,13 @@ let sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; }; }; - "@jridgewell/source-map-0.3.2" = { + "@jridgewell/source-map-0.3.3" = { name = "_at_jridgewell_slash_source-map"; packageName = "@jridgewell/source-map"; - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz"; - sha512 = "m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw=="; + url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz"; + sha512 = "b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg=="; }; }; "@jridgewell/sourcemap-codec-1.4.14" = { @@ -967,13 +967,22 @@ let sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; }; }; - "@jridgewell/trace-mapping-0.3.17" = { + "@jridgewell/sourcemap-codec-1.4.15" = { + name = "_at_jridgewell_slash_sourcemap-codec"; + packageName = "@jridgewell/sourcemap-codec"; + version = "1.4.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"; + sha512 = "eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="; + }; + }; + "@jridgewell/trace-mapping-0.3.18" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.17"; + version = "0.3.18"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz"; - sha512 = "MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g=="; + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz"; + sha512 = "w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -1192,13 +1201,13 @@ let sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; }; }; - "@types/lodash-4.14.191" = { + "@types/lodash-4.14.192" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.191"; + version = "4.14.192"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz"; - sha512 = "BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.192.tgz"; + sha512 = "km+Vyn3BYm5ytMO13k9KTp27O75rbQ0NFw+U//g+PX7VZyjCioXaRFisqSIJRECljcTv73G3i6BpglNGHgUQ5A=="; }; }; "@types/minimatch-5.1.2" = { @@ -1219,13 +1228,13 @@ let sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; }; }; - "@types/node-18.14.6" = { + "@types/node-18.15.11" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.14.6"; + version = "18.15.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz"; - sha512 = "93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz"; + sha512 = "E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q=="; }; }; "@types/node-8.10.66" = { @@ -1777,6 +1786,15 @@ let sha512 = "sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q=="; }; }; + "array-buffer-byte-length-1.0.0" = { + name = "array-buffer-byte-length"; + packageName = "array-buffer-byte-length"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz"; + sha512 = "LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A=="; + }; + }; "array-filter-0.0.1" = { name = "array-filter"; packageName = "array-filter"; @@ -2686,13 +2704,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001462" = { + "caniuse-lite-1.0.30001477" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001462"; + version = "1.0.30001477"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001462.tgz"; - sha512 = "PDd20WuOBPiasZ7KbFnmQRyuLE7cFXW2PVd7dmALzbkUXEP46upAuCDm9eY9vho8fgNMGmbAX92QBZHzcnWIqw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001477.tgz"; + sha512 = "lZim4iUHhGcy5p+Ri/G7m84hJwncj+Kz7S5aD4hoQfslKZJgt0tHc/hafVbqHC5bbhHb+mrW2JOUHkI5KH7toQ=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -2821,6 +2839,15 @@ let sha512 = "/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w=="; }; }; + "chokidar-3.4.2" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz"; + sha512 = "IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A=="; + }; + }; "chokidar-3.5.2" = { name = "chokidar"; packageName = "chokidar"; @@ -2911,13 +2938,13 @@ let sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; }; }; - "cli-spinners-2.7.0" = { + "cli-spinners-2.8.0" = { name = "cli-spinners"; packageName = "cli-spinners"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz"; - sha512 = "qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw=="; + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.8.0.tgz"; + sha512 = "/eG5sJcvEIwxcdYM86k5tPwn0MUzkX5YY3eImTGpJOZgVe4SdTMY14vQpcxgBzJ0wXwAYrS8E+c3uHeK4JNyzQ=="; }; }; "cli-table-0.3.4" = { @@ -3406,13 +3433,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.29.0" = { + "core-js-compat-3.30.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.29.0"; + version = "3.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.29.0.tgz"; - sha512 = "ScMn3uZNAFhK2DGoEfErguoiAHhV2Ju+oJo/jK08p7B3f3UhocUrCCkTvnZaiS+edl5nlIoiBXKcwMc6elv4KQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.30.0.tgz"; + sha512 = "P5A2h/9mRYZFIAP+5Ab8ns6083IyVpSclU74UNvbGVQ8VM7n3n3/g2yF3AkKQ9NXz2O+ioxLbEWKnDtgsFamhg=="; }; }; "core-util-is-1.0.2" = { @@ -3730,6 +3757,15 @@ let sha512 = "NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A=="; }; }; + "d-1.0.1" = { + name = "d"; + packageName = "d"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz"; + sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; + }; + }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -4225,13 +4261,13 @@ let sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; - "electron-to-chromium-1.4.322" = { + "electron-to-chromium-1.4.357" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.322"; + version = "1.4.357"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.322.tgz"; - sha512 = "KovjizNC9XB7dno/2GjxX8VS0SlfPpCjtyoKft+bCO+UfD8bFy16hY4Sh9s0h9BDxbRH2U0zX5VBjpM1LTcNlg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.357.tgz"; + sha512 = "UTkCbNTAcGXABmEnQrGcW4m3cG6fcyBfD4KDF0iyEAlbrGZiY9dmslyDAGOD1Kr5biN2F743Y30aRCOtau35Vw=="; }; }; "elliptic-6.5.4" = { @@ -4333,13 +4369,13 @@ let sha512 = "5GV3WkJ8R/faOP1hwElQdNuCt8tKx2+1lsMrdeIYWSFz01Kp9gJl/R6zGtp4QUyrUtO8KnHsxjHrQNUf2CHkrg=="; }; }; - "elm-tooling-1.13.0" = { + "elm-tooling-1.13.1" = { name = "elm-tooling"; packageName = "elm-tooling"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.13.0.tgz"; - sha512 = "Q+LyrbwN4ZFlm7Lblny8tXVLXdQDkEec4KzZrSW+n4q+la3FQoDY/SgonewBsRM94DkUzW3fjLqpcu3xCcyY5Q=="; + url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.13.1.tgz"; + sha512 = "a6rL9wW12Ep2oCvQtARaRpQSPGyHEoaxak6cBFej7LiKvqBgD2WrPpABNuTRP4eI3Clnmi7j2G5Nljh41+Wshg=="; }; }; "elm-webpack-loader-6.0.1" = { @@ -4459,13 +4495,13 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.21.1" = { + "es-abstract-1.21.2" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.21.1"; + version = "1.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz"; - sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz"; + sha512 = "y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg=="; }; }; "es-array-method-boxes-properly-1.0.0" = { @@ -4495,6 +4531,24 @@ let sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; }; + "es5-ext-0.10.62" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.10.62"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz"; + sha512 = "BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA=="; + }; + }; + "es6-iterator-2.0.3" = { + name = "es6-iterator"; + packageName = "es6-iterator"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; + sha512 = "zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g=="; + }; + }; "es6-promisify-6.1.1" = { name = "es6-promisify"; packageName = "es6-promisify"; @@ -4504,6 +4558,15 @@ let sha512 = "HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg=="; }; }; + "es6-symbol-3.1.3" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz"; + sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; + }; + }; "escalade-3.1.1" = { name = "escalade"; packageName = "escalade"; @@ -4738,6 +4801,15 @@ let sha512 = "KEyUw8AwRET2iFjFsI1EJQrJ/fHeGiJtgpYgEWG3yDv4l/To/m3a2GaYfeGyB3lsWdvbesjF5XCMx+SVBgAAYw=="; }; }; + "ext-1.7.0" = { + name = "ext"; + packageName = "ext"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz"; + sha512 = "6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw=="; + }; + }; "extend-3.0.2" = { name = "extend"; packageName = "extend"; @@ -5692,13 +5764,13 @@ let sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; }; }; - "graceful-fs-4.2.10" = { + "graceful-fs-4.2.11" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.10"; + version = "4.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; - sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz"; + sha512 = "RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="; }; }; "gray-matter-4.0.3" = { @@ -6529,13 +6601,13 @@ let sha512 = "H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA=="; }; }; - "is-core-module-2.11.0" = { + "is-core-module-2.12.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.11.0"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz"; - sha512 = "RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz"; + sha512 = "RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ=="; }; }; "is-data-descriptor-0.1.4" = { @@ -7798,6 +7870,15 @@ let sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw=="; }; }; + "mime-2.4.6" = { + name = "mime"; + packageName = "mime"; + version = "2.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz"; + sha512 = "RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="; + }; + }; "mime-2.6.0" = { name = "mime"; packageName = "mime"; @@ -7978,13 +8059,13 @@ let sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; }; }; - "minipass-4.2.4" = { + "minipass-4.2.7" = { name = "minipass"; packageName = "minipass"; - version = "4.2.4"; + version = "4.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-4.2.4.tgz"; - sha512 = "lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ=="; + url = "https://registry.npmjs.org/minipass/-/minipass-4.2.7.tgz"; + sha512 = "ScVIgqHcXRMyfflqHmEW0bm8z8rb5McHyOY3ewX9JBgZaR77G7nxq9L/mtV96/QbAAwtbCAHVVLzD1kkyfFQEw=="; }; }; "minizlib-1.3.3" = { @@ -8176,13 +8257,13 @@ let sha512 = "2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="; }; }; - "nanoid-3.3.4" = { + "nanoid-3.3.6" = { name = "nanoid"; packageName = "nanoid"; - version = "3.3.4"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"; - sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz"; + sha512 = "BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="; }; }; "nanomatch-1.2.13" = { @@ -8221,6 +8302,15 @@ let sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; }; + "next-tick-1.1.0" = { + name = "next-tick"; + packageName = "next-tick"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz"; + sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="; + }; + }; "nice-try-1.0.5" = { name = "nice-try"; packageName = "nice-try"; @@ -8248,6 +8338,15 @@ let sha512 = "VQsT8QSierYGkHzRed+b4MnccQVF1+qPHunE8jBoU7jD6YpuRqCDPzEoC2zfyEJS80qVnlMZrqobLnyjzX9lJg=="; }; }; + "node-elm-compiler-5.0.5" = { + name = "node-elm-compiler"; + packageName = "node-elm-compiler"; + version = "5.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/node-elm-compiler/-/node-elm-compiler-5.0.5.tgz"; + sha512 = "vapB+VkmKMY1NRy7jjpGjzwWbKmtiRfzbgVoV/eROz5Kx30QvY0Nd5Ua7iST+9utrn1aG8cVToXC6UWdEO5BKQ=="; + }; + }; "node-elm-compiler-5.0.6" = { name = "node-elm-compiler"; packageName = "node-elm-compiler"; @@ -10111,13 +10210,13 @@ let sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="; }; }; - "readable-stream-3.6.1" = { + "readable-stream-3.6.2" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz"; - sha512 = "+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"; + sha512 = "9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="; }; }; "readdirp-2.2.1" = { @@ -10138,6 +10237,15 @@ let sha512 = "ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q=="; }; }; + "readdirp-3.4.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; + sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; + }; + }; "readdirp-3.6.0" = { name = "readdirp"; packageName = "readdirp"; @@ -10237,13 +10345,13 @@ let sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; }; }; - "regexpu-core-5.3.1" = { + "regexpu-core-5.3.2" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.1.tgz"; - sha512 = "nCOzW2V/X15XpLsK2rlgdwrysrBq+AauCn+omItIz4R1pIcmeot5zvjdmOBRLzEH/CkC6IxMJVmxDe3QcMuNVQ=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz"; + sha512 = "RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ=="; }; }; "registry-auth-token-4.2.2" = { @@ -10399,13 +10507,13 @@ let sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; }; }; - "resolve-1.22.1" = { + "resolve-1.22.2" = { name = "resolve"; packageName = "resolve"; - version = "1.22.1"; + version = "1.22.2"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"; - sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz"; + sha512 = "Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g=="; }; }; "resolve-alpn-1.2.1" = { @@ -10768,13 +10876,13 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.3.8" = { + "semver-7.4.0" = { name = "semver"; packageName = "semver"; - version = "7.3.8"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"; - sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; + url = "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz"; + sha512 = "RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw=="; }; }; "semver-regex-3.1.4" = { @@ -11236,13 +11344,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.12" = { + "spdx-license-ids-3.0.13" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.12"; + version = "3.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz"; - sha512 = "rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz"; + sha512 = "XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="; }; }; "spdy-4.0.2" = { @@ -11470,6 +11578,15 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; + "string.prototype.trim-1.2.7" = { + name = "string.prototype.trim"; + packageName = "string.prototype.trim"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz"; + sha512 = "p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg=="; + }; + }; "string.prototype.trimend-1.0.6" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; @@ -11803,13 +11920,22 @@ let sha512 = "4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="; }; }; - "terser-5.16.5" = { + "terser-5.16.9" = { name = "terser"; packageName = "terser"; - version = "5.16.5"; + version = "5.16.9"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.16.5.tgz"; - sha512 = "qcwfg4+RZa3YvlFh0qjifnzBHjKGNbtDo9yivMqMFDy9Q6FSaQWSB/j1xKhsoUFJIqDOM3TsN6D5xbrMrFcHbg=="; + url = "https://registry.npmjs.org/terser/-/terser-5.16.9.tgz"; + sha512 = "HPa/FdTB9XGI2H1/keLFZHxl6WNvAI4YalHGtDQTlMnJcoqSab1UwL4l1hGEhs6/GmLHBZIg/YgB++jcbzoOEg=="; + }; + }; + "terser-5.3.8" = { + name = "terser"; + packageName = "terser"; + version = "5.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-5.3.8.tgz"; + sha512 = "zVotuHoIfnYjtlurOouTazciEfL7V38QMAOhGqpXDEg6yT13cF4+fEP9b0rrCEQTn+tT46uxgFsTZzhygk+CzQ=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -12118,6 +12244,24 @@ let sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; }; }; + "type-1.2.0" = { + name = "type"; + packageName = "type"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz"; + sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; + }; + }; + "type-2.7.2" = { + name = "type"; + packageName = "type"; + version = "2.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type/-/type-2.7.2.tgz"; + sha512 = "dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="; + }; + }; "type-fest-0.10.0" = { name = "type-fest"; packageName = "type-fest"; @@ -12172,6 +12316,15 @@ let sha512 = "ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ=="; }; }; + "typedarray-to-buffer-3.1.5" = { + name = "typedarray-to-buffer"; + packageName = "typedarray-to-buffer"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; + }; + }; "typescript-4.9.5" = { name = "typescript"; packageName = "typescript"; @@ -12694,13 +12847,13 @@ let sha512 = "XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg=="; }; }; - "web-tree-sitter-0.20.7" = { + "web-tree-sitter-0.20.8" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; - version = "0.20.7"; + version = "0.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.20.7.tgz"; - sha512 = "flC9JJmTII9uAeeYpWF8hxDJ7bfY+leldQryetll8Nv4WgI+MXc6h7TiyAZASWl9uC9TvmfdgOjZn1DAQecb3A=="; + url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.20.8.tgz"; + sha512 = "weOVgZ3aAARgdnb220GqYuh7+rZU0Ka9k9yfKtGAzEYMa6GgiCzW9JjQRJyCJakvibQW+dfjJdihjInKuuCAUQ=="; }; }; "webpack-4.44.2" = { @@ -12757,6 +12910,15 @@ let sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; + "websocket-1.0.32" = { + name = "websocket"; + packageName = "websocket"; + version = "1.0.32"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket/-/websocket-1.0.32.tgz"; + sha512 = "i4yhcllSP4wrpoPMU2N0TQ/q0O94LRG/eUQjEAamRltjQ1oT1PFFKOG4i877OlJgCG8rw6LrrowJp+TYCEWF7Q=="; + }; + }; "websocket-driver-0.6.5" = { name = "websocket-driver"; packageName = "websocket-driver"; @@ -13153,6 +13315,15 @@ let sha512 = "JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="; }; }; + "yaeti-0.0.6" = { + name = "yaeti"; + packageName = "yaeti"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz"; + sha512 = "MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug=="; + }; + }; "yallist-2.1.2" = { name = "yallist"; packageName = "yallist"; @@ -13335,7 +13506,7 @@ in sources."fresh-0.5.2" sources."fs-extra-2.0.0" sources."getpass-0.1.7" - sources."graceful-fs-4.2.10" + sources."graceful-fs-4.2.11" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."http-errors-1.7.2" @@ -13547,7 +13718,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.4" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.10" + sources."graceful-fs-4.2.11" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -13581,7 +13752,7 @@ in sources."mime-types-2.1.35" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."minipass-4.2.4" + sources."minipass-4.2.7" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -13949,7 +14120,7 @@ in sources."vscode-languageserver-textdocument-1.0.8" sources."vscode-languageserver-types-3.17.3" sources."vscode-uri-3.0.7" - sources."web-tree-sitter-0.20.7" + sources."web-tree-sitter-0.20.8" sources."which-2.0.2" ]; buildInputs = globalBuildInputs; @@ -14079,6 +14250,98 @@ in bypassCache = true; reconstructLock = true; }; + elm-spa = nodeEnv.buildNodePackage { + name = "elm-spa"; + packageName = "elm-spa"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-spa/-/elm-spa-6.0.4.tgz"; + sha512 = "TiOBuxL1SrzqYyWkime3AZ1/xFqKa6B/Bi4SplFg7YmlwPL5d7R+u6w0dxc14cnvmP1RS2+QZAkczZtqayFK9A=="; + }; + dependencies = [ + sources."anymatch-3.1.3" + sources."balanced-match-1.0.2" + sources."binary-extensions-2.2.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."buffer-from-1.1.2" + sources."bufferutil-4.0.7" + sources."chokidar-3.4.2" + sources."commander-2.20.3" + sources."concat-map-0.0.1" + sources."cross-spawn-6.0.5" + sources."d-1.0.1" + sources."debug-2.6.9" + sources."es5-ext-0.10.62" + sources."es6-iterator-2.0.3" + sources."es6-symbol-3.1.3" + (sources."ext-1.7.0" // { + dependencies = [ + sources."type-2.7.2" + ]; + }) + sources."fill-range-7.0.1" + sources."find-elm-dependencies-2.0.4" + sources."firstline-1.3.1" + sources."fs.realpath-1.0.0" + sources."fsevents-2.1.3" + sources."glob-7.2.3" + sources."glob-parent-5.1.2" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.3" + sources."is-number-7.0.0" + sources."is-typedarray-1.0.0" + sources."isexe-2.0.0" + sources."lodash-4.17.21" + sources."mime-2.4.6" + sources."minimatch-3.1.2" + sources."minimist-1.2.8" + sources."mkdirp-0.5.6" + sources."ms-2.0.0" + sources."next-tick-1.1.0" + sources."nice-try-1.0.5" + sources."node-elm-compiler-5.0.5" + sources."node-gyp-build-4.6.0" + sources."normalize-path-3.0.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."picomatch-2.3.1" + sources."readdirp-3.4.0" + sources."rimraf-2.6.3" + sources."semver-5.7.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."source-map-0.7.4" + (sources."source-map-support-0.5.21" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."temp-0.9.4" + sources."terser-5.3.8" + sources."to-regex-range-5.0.1" + sources."type-1.2.0" + sources."typedarray-to-buffer-3.1.5" + sources."utf-8-validate-5.0.10" + sources."websocket-1.0.32" + sources."which-1.3.1" + sources."wrappy-1.0.2" + sources."yaeti-0.0.6" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "single page apps made easy"; + homepage = "https://github.com/ryannhg/elm-spa#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; @@ -14106,7 +14369,7 @@ in sources."fsevents-2.3.2" sources."glob-8.1.0" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.10" + sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -14155,7 +14418,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.14.6" + sources."@types/node-18.15.11" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.2" @@ -14174,7 +14437,7 @@ in sources."get-proxy-2.1.0" sources."get-stream-5.2.0" sources."got-10.7.0" - sources."graceful-fs-4.2.10" + sources."graceful-fs-4.2.11" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."http-cache-semantics-4.1.1" @@ -14201,7 +14464,7 @@ in sources."responselike-2.0.1" sources."safe-buffer-5.2.1" sources."safename-1.0.2" - sources."semver-7.3.8" + sources."semver-7.4.0" sources."to-readable-stream-2.1.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.10.0" @@ -14303,7 +14566,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.4" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.10" + sources."graceful-fs-4.2.11" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -14429,7 +14692,7 @@ in sources."compare-versions-3.6.0" sources."core-util-is-1.0.3" sources."fs-extra-6.0.1" - sources."graceful-fs-4.2.10" + sources."graceful-fs-4.2.11" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."jsonfile-4.0.0" @@ -14471,25 +14734,25 @@ in }; dependencies = [ sources."@babel/cli-7.12.10" - sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.21.0" + sources."@babel/code-frame-7.21.4" + sources."@babel/compat-data-7.21.4" sources."@babel/core-7.12.10" - sources."@babel/generator-7.21.1" + sources."@babel/generator-7.21.4" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" - (sources."@babel/helper-compilation-targets-7.20.7" // { + (sources."@babel/helper-compilation-targets-7.21.4" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.21.0" - sources."@babel/helper-create-regexp-features-plugin-7.21.0" + sources."@babel/helper-create-class-features-plugin-7.21.4" + sources."@babel/helper-create-regexp-features-plugin-7.21.4" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-explode-assignable-expression-7.18.6" sources."@babel/helper-function-name-7.21.0" sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-member-expression-to-functions-7.21.0" - sources."@babel/helper-module-imports-7.18.6" + sources."@babel/helper-module-imports-7.21.4" sources."@babel/helper-module-transforms-7.21.2" sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.20.2" @@ -14504,7 +14767,7 @@ in sources."@babel/helper-wrap-function-7.20.5" sources."@babel/helpers-7.21.0" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.21.2" + sources."@babel/parser-7.21.4" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-dynamic-import-7.18.6" @@ -14536,7 +14799,7 @@ in sources."@babel/plugin-transform-block-scoping-7.21.0" sources."@babel/plugin-transform-classes-7.21.0" sources."@babel/plugin-transform-computed-properties-7.20.7" - sources."@babel/plugin-transform-destructuring-7.20.7" + sources."@babel/plugin-transform-destructuring-7.21.3" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -14551,7 +14814,7 @@ in sources."@babel/plugin-transform-named-capturing-groups-regex-7.20.5" sources."@babel/plugin-transform-new-target-7.18.6" sources."@babel/plugin-transform-object-super-7.18.6" - sources."@babel/plugin-transform-parameters-7.20.7" + sources."@babel/plugin-transform-parameters-7.21.3" sources."@babel/plugin-transform-property-literals-7.18.6" sources."@babel/plugin-transform-regenerator-7.20.5" sources."@babel/plugin-transform-reserved-words-7.18.6" @@ -14568,18 +14831,22 @@ in sources."@babel/regjsgen-0.8.0" sources."@babel/runtime-7.12.5" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.21.2" - sources."@babel/types-7.21.2" + sources."@babel/traverse-7.21.4" + sources."@babel/types-7.21.4" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" sources."@hapi/joi-15.1.1" sources."@hapi/topo-3.1.6" - sources."@jridgewell/gen-mapping-0.3.2" + sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.17" + sources."@jridgewell/sourcemap-codec-1.4.15" + (sources."@jridgewell/trace-mapping-0.3.18" // { + dependencies = [ + sources."@jridgewell/sourcemap-codec-1.4.14" + ]; + }) sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.2.0" @@ -14587,7 +14854,7 @@ in sources."@types/http-proxy-1.17.10" sources."@types/json-schema-7.0.11" sources."@types/minimatch-5.1.2" - sources."@types/node-18.14.6" + sources."@types/node-18.15.11" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@types/source-list-map-0.1.2" @@ -14645,6 +14912,7 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" + sources."array-buffer-byte-length-1.0.0" sources."array-filter-0.0.1" sources."array-flatten-2.1.2" sources."array-map-0.0.1" @@ -14734,7 +15002,7 @@ in sources."browserify-rsa-4.1.0" (sources."browserify-sign-4.2.1" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" ]; }) @@ -14756,7 +15024,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001462" + sources."caniuse-lite-1.0.30001477" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -14855,7 +15123,7 @@ in ]; }) sources."core-js-2.6.12" - sources."core-js-compat-3.29.0" + sources."core-js-compat-3.30.0" sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { @@ -14882,7 +15150,7 @@ in sources."lru-cache-6.0.0" sources."picocolors-0.2.1" sources."postcss-7.0.39" - sources."semver-7.3.8" + sources."semver-7.4.0" sources."source-map-0.6.1" sources."yallist-4.0.0" ]; @@ -14979,7 +15247,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.322" + sources."electron-to-chromium-1.4.357" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -15017,7 +15285,7 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.21.1" + sources."es-abstract-1.21.2" sources."es-array-method-boxes-properly-1.0.0" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" @@ -15195,7 +15463,7 @@ in ]; }) sources."gopd-1.0.1" - sources."graceful-fs-4.2.10" + sources."graceful-fs-4.2.11" (sources."gzip-size-5.0.0" // { dependencies = [ sources."pify-3.0.0" @@ -15224,7 +15492,7 @@ in }) (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" ]; }) @@ -15303,7 +15571,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.7" sources."is-color-stop-1.1.0" - sources."is-core-module-2.11.0" + sources."is-core-module-2.12.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" @@ -15424,7 +15692,7 @@ in sources."multicast-dns-service-types-1.1.0" sources."mute-stream-0.0.8" sources."nan-2.17.0" - sources."nanoid-3.3.4" + sources."nanoid-3.3.6" sources."nanomatch-1.2.13" sources."ncp-1.0.1" sources."negotiator-0.6.3" @@ -15623,7 +15891,7 @@ in sources."path-type-4.0.0" sources."resolve-from-4.0.0" sources."schema-utils-3.1.1" - sources."semver-7.3.8" + sources."semver-7.4.0" sources."yallist-4.0.0" ]; }) @@ -15912,7 +16180,7 @@ in sources."regenerator-transform-0.15.1" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.3.1" + sources."regexpu-core-5.3.2" (sources."regjsparser-0.9.1" // { dependencies = [ sources."jsesc-0.5.0" @@ -15932,7 +16200,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.22.1" + sources."resolve-1.22.2" sources."resolve-cwd-2.0.0" sources."resolve-dir-1.0.1" sources."resolve-from-3.0.0" @@ -16060,11 +16328,11 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."split-1.0.1" @@ -16103,6 +16371,7 @@ in sources."strip-ansi-6.0.1" ]; }) + sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" sources."string_decoder-1.1.1" @@ -16538,12 +16807,16 @@ in sha512 = "uC6XZAmakIcRYJlqywgHsnVNlwzQZxVqPo8fsFCJWBYwwjWhD/uYSFGdFwB29wyxaI6BgRi8Rm745VU1oCortg=="; }; dependencies = [ - sources."@jridgewell/gen-mapping-0.3.2" + sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/source-map-0.3.2" - sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.17" + sources."@jridgewell/source-map-0.3.3" + sources."@jridgewell/sourcemap-codec-1.4.15" + (sources."@jridgewell/trace-mapping-0.3.18" // { + dependencies = [ + sources."@jridgewell/sourcemap-codec-1.4.14" + ]; + }) sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -16553,7 +16826,7 @@ in sources."@types/debug-0.0.30" sources."@types/get-port-3.2.0" sources."@types/glob-5.0.38" - sources."@types/lodash-4.14.191" + sources."@types/lodash-4.14.192" sources."@types/minimatch-5.1.2" sources."@types/mkdirp-0.5.2" sources."@types/node-8.10.66" @@ -16661,7 +16934,7 @@ in sources."glob-parent-5.1.2" sources."globby-11.0.4" sources."got-9.6.0" - sources."graceful-fs-4.2.10" + sources."graceful-fs-4.2.11" sources."gray-matter-4.0.3" sources."has-1.0.3" sources."has-flag-4.0.0" @@ -16791,7 +17064,7 @@ in sources."strip-json-comments-2.0.1" sources."sudo-prompt-8.2.5" sources."supports-color-7.2.0" - (sources."terser-5.16.5" // { + (sources."terser-5.16.9" // { dependencies = [ sources."commander-2.20.3" ]; @@ -16826,10 +17099,10 @@ in elm-review = nodeEnv.buildNodePackage { name = "elm-review"; packageName = "elm-review"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/elm-review/-/elm-review-2.9.1.tgz"; - sha512 = "n8NwLRqD7HWGP/BCzNdb1iIu7b4tLtlKf27ydDrBUkA+CmwyocHQ3yUV2WOrMttiy2IkJrHszLXsngnebaWWbA=="; + url = "https://registry.npmjs.org/elm-review/-/elm-review-2.9.2.tgz"; + sha512 = "fgmLh2dQnV/dtq+aAKThUwmW/MVYgkShJmvr2G3IbQJBdwJM1MzuMhIZ7S1yp1u0npN8VUn05oOoRh+utMRQXw=="; }; dependencies = [ sources."@sindresorhus/is-4.6.0" @@ -16837,7 +17110,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.14.6" + sources."@types/node-18.15.11" sources."@types/responselike-1.0.0" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -16856,7 +17129,7 @@ in sources."chalk-4.1.2" sources."chokidar-3.5.3" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.7.0" + sources."cli-spinners-2.8.0" sources."clone-1.0.4" sources."clone-response-1.0.3" sources."color-convert-2.0.1" @@ -16871,7 +17144,7 @@ in }) sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" - sources."elm-tooling-1.13.0" + sources."elm-tooling-1.13.1" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."fast-levenshtein-3.0.0" @@ -16890,7 +17163,7 @@ in }) sources."glob-parent-5.1.2" sources."got-11.8.6" - sources."graceful-fs-4.2.10" + sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" sources."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" @@ -16934,7 +17207,7 @@ in sources."prompts-2.4.2" sources."pump-3.0.0" sources."quick-lru-5.1.1" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."readdirp-3.6.0" sources."resolve-alpn-1.2.1" sources."responselike-2.0.1" @@ -16986,7 +17259,7 @@ in sources."git-clone-able-0.1.2" sources."lru-cache-6.0.0" sources."ms-2.1.2" - sources."semver-7.3.8" + sources."semver-7.4.0" sources."simple-git-3.17.0" sources."upath-2.0.1" sources."yallist-4.0.0" diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index b0401b03faceb..73d022c9fd91a 100644 --- a/pkgs/development/compilers/openjdk/15.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -9,16 +9,19 @@ }: let - major = "15"; - update = ".0.1"; - build = "-ga"; + version = { + major = "15"; + update = ".0.1"; + build = "-ga"; + __toString = self: "${self.major}${self.update}${self.build}"; + }; - openjdk = stdenv.mkDerivation rec { + openjdk = stdenv.mkDerivation { pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${major}${update}${build}"; + inherit version; src = fetchurl { - url = "https://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; + url = "https://hg.openjdk.java.net/jdk-updates/jdk${version.major}u/archive/jdk-${version}.tar.gz"; sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l"; }; @@ -149,8 +152,8 @@ let disallowedReferences = [ openjdk15-bootstrap ]; - pos = builtins.unsafeGetAttrPos "feature" version; - meta = import ./meta.nix lib version; + pos = builtins.unsafeGetAttrPos "major" version; + meta = import ./meta.nix lib version.major; passthru = { architecture = ""; diff --git a/pkgs/development/libraries/sparrow3d/default.nix b/pkgs/development/libraries/sparrow3d/default.nix new file mode 100644 index 0000000000000..a502b6249a16c --- /dev/null +++ b/pkgs/development/libraries/sparrow3d/default.nix @@ -0,0 +1,98 @@ +{ lib +, stdenv +, copyPkgconfigItems +, fetchFromGitHub +, makePkgconfigItem +, pkg-config +, SDL +, SDL_image +, SDL_mixer +, SDL_net +, SDL_ttf +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sparrow3d"; + version = "unstable-2020-10-06"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "theZiz"; + repo = "sparrow3d"; + rev = "2033349d7adeba34bda2c442e1fec22377471134"; + hash = "sha256-28j5nbTYBrMN8BQ6XrTlO1D8Viw+RiT3MAl99BAbhR4="; + }; + + pkgconfigItems = [ + (makePkgconfigItem rec { + name = "sparrow3d"; + inherit (finalAttrs) version; + inherit (finalAttrs.meta) description; + + cflags = [ "-isystem${variables.includedir}" ]; + libs = [ + "-L${variables.libdir}" + "-lsparrow3d" + "-lsparrowNet" + "-lsparrowSound" + ]; + variables = rec { + prefix = "@dev@"; + exec_prefix = "@out@"; + includedir = "${prefix}/include"; + libdir = "${exec_prefix}/lib"; + }; + }) + ]; + + nativeBuildInputs = [ + copyPkgconfigItems + pkg-config + ]; + + propagatedBuildInputs = [ + SDL.dev + SDL_image + SDL_ttf + SDL_mixer + SDL_net + ]; + + postConfigure = '' + NIX_CFLAGS_COMPILE=$(pkg-config --cflags SDL_image SDL_ttf SDL_mixer SDL_net) + ''; + + buildFlags = [ "dynamic" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp libsparrow{3d,Net,Sound}.so $out/lib + + mkdir -p $dev/include + cp sparrow*.h $dev/include + + runHook postInstall + ''; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + make all_no_static + ./testfile.sh + + runHook postCheck + ''; + + meta = { + homepage = "https://github.com/theZiz/sparrow3d"; + description = "A software renderer for different open handhelds like the gp2x, wiz, caanoo and pandora"; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ colinsane ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/development/libraries/sparrow3d/sparrow3d.pc.in b/pkgs/development/libraries/sparrow3d/sparrow3d.pc.in new file mode 100644 index 0000000000000..ac87c4ff278b1 --- /dev/null +++ b/pkgs/development/libraries/sparrow3d/sparrow3d.pc.in @@ -0,0 +1,16 @@ +prefix=@out@ +includedir=${prefix}/include +libdir=${prefix}/lib + +Name: sparrow3d +Description: a software renderer for different open handhelds like the gp2x, wiz, caanoo and pandora +URL: https://github.com/theZiz/sparrow3d +Version: @version@ +Requires: \ + sdl \ + SDL_image \ + SDL_ttf \ + SDL_mixer \ + SDL_net +Cflags: -isystem${includedir} +Libs: -L${libdir} -lsparrow3d -lsparrowNet -lsparrowSound diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 3a88e3bd04b41..b2fcf8eb1ebb0 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "61"; + version = "62"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = "R${version}"; - sha256 = "sha256-JJWq706GLywUO5voYKzxcOvMWF4/NXEbqOrj5uG4DWw="; + sha256 = "sha256-/40+SXFLX8upGKP3K+wk8RnO1Al4YoF8GFXyoxTkKs0="; }; patches = [ diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 4e6c6aaae870d..1f8c9227492eb 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.18.0"; + version = "3.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BW+zYDmK9CPmzePAgQWXRQ8JrQNgEulPGtQgUdnrY4I="; + hash = "sha256-oOGs6qAFq9Y17ktJeiQvd/UgUgV3nEt2m/dpZyRb0fs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index b0314d615a99c..ebe12685998b3 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.10.1"; + version = "1.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/iUUTtBxBmiDIczIRuwbr/SLTs2hYKXSAbufmjFtMDU="; + hash = "sha256-0dBaSz7G+DC73Md5p0DpY6gNMkpP1u9Bp8JIoHz5ZIk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index 2aab21e7e7854..ba3cc3dfe2464 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.9.0"; + version = "2.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mr14CDo+M01ZRfNLerFNeikExmIcV0j17zX/Xn8JT80="; + hash = "sha256-6+6EsRdj38jD+i3nhVHOI1wVGWYKMIGDILHgO3wN7zg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 668556d4fc811..956e2ee0ec671 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.9.0"; + version = "2.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7rKNcG11cgvvwNEYiN9l8h8UR8u6DFfcI+S1QDi+t/c="; + hash = "sha256-sG2qgQsv1dIEI+2cICxJllmey4hbYRb8tzTcnhS3Yyg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/intreehooks/default.nix b/pkgs/development/python-modules/intreehooks/default.nix deleted file mode 100644 index cec0f2a7120dc..0000000000000 --- a/pkgs/development/python-modules/intreehooks/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytoml -, pytest -}: - -buildPythonPackage rec { - pname = "intreehooks"; - version = "1.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "87e600d3b16b97ed219c078681260639e77ef5a17c0e0dbdd5a302f99b4e34e1"; - }; - - propagatedBuildInputs = [ pytoml ]; - - nativeCheckInputs = [ pytest ]; - - meta = { - description = "Load a PEP 517 backend from inside the source tree"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.fridh ]; - homepage = "https://github.com/takluyver/intreehooks"; - }; -} diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index e5b7975d5ede3..b3ad5d6cd6896 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.21.0"; + version = "0.21.1"; format = "pyproject"; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nZPVS3jNz2e2LTlWiSz1fN7MzqJs/CqtAt6UVZaPPTY="; + hash = "sha256-mWujuw2n5PfGdVnORTyYe83BGnwwZ/BFxt9BR5udZDA="; }; postPatch = '' @@ -43,6 +43,8 @@ buildPythonPackage rec { disabledTests = [ # Fail with: 'no server running on /tmp/tmux-1000/libtmux_test8sorutj1'. "test_new_session_width_height" + # Assertion error + "test_capture_pane_start" ] ++ lib.optionals stdenv.isDarwin [ # tests/test_pane.py:113: AssertionError "test_capture_pane_start" @@ -53,7 +55,9 @@ buildPythonPackage rec { "tests/legacy_api/test_test.py" ]; - pythonImportsCheck = [ "libtmux" ]; + pythonImportsCheck = [ + "libtmux" + ]; meta = with lib; { description = "Typed scripting library / ORM / API wrapper for tmux"; diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index c648ec9fed6b1..92dd8d2f3d64c 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.28.2"; + version = "0.29.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KrDxKAx5Plrsgd6rPmPsI2iN3+BeXzislgNooQeVIKE="; + hash = "sha256-NSOndDkO8MHA98cIp1GYCcU5bPYIcg8U9Vw290/1u+w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix index adf39ad10a0aa..b48f1110eefcc 100644 --- a/pkgs/development/python-modules/oracledb/default.nix +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "oracledb"; - version = "1.2.2"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-3Z9jCE5EZCtISkay/PtPySHzn6z0lKG6sAYo+mQJ9Pw="; + hash = "sha256-8QWkcFkWoo0z4pGPo2NAl/6DVSv16oGvw6emhSjJ4vM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index fcacfcd5b4089..c6a8a1f4021ea 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "15.1.1"; + version = "15.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7cr37kvNgPPTYJd5r1RXy7qFNN0nXI74YHPg9k8ZDfw="; + hash = "sha256-71ea8r1g52SyWxG+aTl53WanM5z4XAj9k5E26ivpYoE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 429303a713f66..45b2475f69fc1 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.123"; + version = "2.1.131"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XPjHql8hrgxmJuD/whe/+wUuAd7zj/db9zkJX9eEKIo="; + hash = "sha256-eG1giXUuQfxROe0H8ZhU0qde8LZwRXy6YCiT54mZ6q4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index e768bb25290b6..58087e6952804 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.7"; + version = "8.13.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JTuw4BJQ0hoR8rQrPm4WG39ssqxEDi4qlcHacdIh7ho="; + hash = "sha256-S6kqkX+49uP+M/0EudhCmYUs4jcokSnuTtpHoEOlxsQ="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 5034d9939c1c6..89b081499e39f 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.7.1"; + version = "1.7.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Rx8mHBmJw4gh0FtQBVMmOlQklODplrhnWwzsEhQm4NE="; + hash = "sha256-jsWk2HDDRjOAPGX1K9NqhWkA5xD2fM830z7g7Kee0yQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index b2e83763478f5..598dac359ca84 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytile"; - version = "2022.10.0"; + version = "2023.04.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - hash = "sha256-fxtDqbslUyV/Otwy9MPIC8DSepTnEZiJKzeU8nlsnWI="; + hash = "sha256-SFHWhXKC7PIqanJIQyGcpM8klwxOAJPVtzk9w0i2YYA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 937f76ee139ca..28a19d85602b2 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.5.11"; + version = "0.5.12"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-vz4hkma/EzAUL9+I8umzyDkAUGcaiBUEtn+WysX6M7o="; + hash = "sha256-HMuMoJFiI/zmFGuhoj9jtE073MvIZRA8bvUNIYlBvOY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index 1247312ad0fcc..8ed6525fd0723 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.22.1"; + version = "2.23.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VGgNvyQ6Kwz/DlkeHSaWkulCZSc7UquQmUpmFVXASsc="; + hash = "sha256-Dfr+CCOdqubBb6po9gtXddQMQRByXhp8VFrUx/tm1Og="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqltrie/default.nix b/pkgs/development/python-modules/sqltrie/default.nix index 8a9c25c5353d8..1181643f36996 100644 --- a/pkgs/development/python-modules/sqltrie/default.nix +++ b/pkgs/development/python-modules/sqltrie/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqltrie"; - version = "0.1.0"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-98x9kIkOIe5QIIlQ4nA2ewFpCczXB7IZBsSLQgGbdzc="; + hash = "sha256-e/3Tq2H9I0zvqq0+q1c3nbz2UiMNX7JpVpVC9suvYRM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix index 763541221d0a6..4653189fbf637 100644 --- a/pkgs/development/python-modules/sshfs/default.nix +++ b/pkgs/development/python-modules/sshfs/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "sshfs"; - version = "2023.1.0"; + version = "2023.4.1"; src = fetchFromGitHub { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-TETxjBI4T8dgmtCtx/lq2LIIwyFsAMWY6xdm7+Qsjb0="; + hash = "sha256-qoOqKXtmavKgfbg6bBEeZb+n1RVyZSxqhKIQsToxDUU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index cb6670c785db6..8e119142bb8b2 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -16,12 +16,14 @@ # Test inputs , python , pytest +, py-cpuinfo }: buildPythonPackage rec { pname = "tables"; version = "3.8.0"; - disabled = pythonOlder "3.5"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; @@ -40,11 +42,13 @@ buildPythonPackage rec { hdf5 lzo ]; + propagatedBuildInputs = [ blosc2 + py-cpuinfo numpy numexpr - packaging # uses packaging.version at runtime + packaging # uses packaging.version at runtime ]; # When doing `make distclean`, ignore docs @@ -92,6 +96,7 @@ buildPythonPackage rec { meta = with lib; { description = "Hierarchical datasets for Python"; homepage = "https://www.pytables.org/"; + changelog = "https://github.com/PyTables/PyTables/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index ce4c3cbee13e3..a28109b5c2cf7 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "3.9.0"; + version = "3.10.0"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "twitchAPI"; inherit version; - hash = "sha256-M3Jl3DGvjWdeqYOWmOSe/W9h9yZq4HVGrDR+5tEXBow="; + hash = "sha256-zYcAuPVbPAqGpLwRfHozM6RTpH9CkIyjlKi9Jtqp9ug="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index 5976a307bf0a4..9a45044f9a07a 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -26,6 +26,12 @@ buildPythonPackage rec { tomli ]; + passthru.optional-dependencies = { + toml = lib.optionals (pythonOlder "3.11") [ + tomli + ]; + }; + # Couldn't get tests to work because, for instance, they used virtualenv and pip doCheck = false; @@ -35,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Version-string management for VCS-controlled trees"; - homepage = "https://github.com/warner/python-versioneer"; + homepage = "https://github.com/python-versioneer/python-versioneer"; changelog = "https://github.com/python-versioneer/python-versioneer/blob/${version}/NEWS.md"; license = licenses.publicDomain; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 23e11a324337c..8ddc38beb5ec9 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -12,6 +12,7 @@ , OpenGL , AppKit , Cocoa +, libxcrypt }: python3.pkgs.buildPythonApplication rec { @@ -120,6 +121,10 @@ python3.pkgs.buildPythonApplication rec { --replace "python3 -c " "${python3.interpreter} -c " ''; + buildInputs = lib.optionals (python3.pythonOlder "3.9") [ + libxcrypt + ]; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/pkgs/development/tools/database/mermerd/default.nix b/pkgs/development/tools/database/mermerd/default.nix new file mode 100644 index 0000000000000..53291e2e0a035 --- /dev/null +++ b/pkgs/development/tools/database/mermerd/default.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "mermerd"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "KarnerTh"; + repo = "mermerd"; + rev = "refs/tags/v${version}"; + hash = "sha256-8GXI5UEDGx5E+YzcAoguvKeNTwpC5ftReIvrKGg31ZA="; + }; + + vendorHash = "sha256-RSCpkQymvUvY2bOkjhsyKnDa3vezUjC33Nwv0+O4OOQ="; + + # the tests expect a database to be running + doCheck = false; + + meta = with lib; { + description = "Create Mermaid-Js ERD diagrams from existing tables"; + homepage = "https://github.com/KarnerTh/mermerd"; + license = licenses.mit; + maintainers = with lib.maintainers; [ austin-artificial ]; + changelog = "https://github.com/KarnerTh/mermerd/releases/tag/v${version}"; + }; + +} diff --git a/pkgs/development/tools/gotraceui/default.nix b/pkgs/development/tools/gotraceui/default.nix new file mode 100644 index 0000000000000..02652f62acab6 --- /dev/null +++ b/pkgs/development/tools/gotraceui/default.nix @@ -0,0 +1,45 @@ +{ + stdenv, lib, fetchFromGitHub, pkg-config, buildGoModule, + libGL, libX11, libXcursor, libXfixes, libxkbcommon, vulkan-headers, wayland, +}: + +buildGoModule rec { + pname = "gotraceui"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "dominikh"; + repo = "gotraceui"; + rev = "v${version}"; + sha256 = "sha256-KgDQ0lL3J1QT5Oij+4Nu3wpzvGiCTaOTIBTd5WJhhz8="; + }; + + vendorSha256 = "sha256-qnHU/Ht5+BGVoGbz2h9/k3gD1L2qAW0eZJ2xBzJatHQ="; + subPackages = ["cmd/gotraceui"]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + vulkan-headers + libxkbcommon + wayland + libX11 + libXcursor + libXfixes + libGL + ]; + + ldflags = ["-X gioui.org/app.ID=co.honnef.Gotraceui"]; + + postInstall = '' + cp -r share $out/ + ''; + + meta = with lib; { + description = "An efficient frontend for Go execution traces"; + homepage = "https://github.com/dominikh/gotraceui"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ dominikh ]; + }; +} diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index bf91279406b77..7c191cbdf747f 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { jbang uses the java language to build scripts similar to groovy scripts. Dependencies are automatically downloaded and the java code runs. ''; - homepage = "https://https://www.jbang.dev/"; + homepage = "https://www.jbang.dev"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ moaxcp ]; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 0e343e1c9eaac..f53a6e313c610 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.500"; + version = "0.0.509"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-ESWGSRE/XY2EXe/j5M8UKuHGGDhl9kVWjTUxU8Ws7n4="; + hash = "sha256-GVYmjRtpC9Sz1r3wLgWB7OKAc+307uXKHfD6Cek+8gE="; }; - vendorHash = "sha256-YYumFyLDIU1JdkoNGQksSWg3OiZGAwP21HvloiCyn9A="; + vendorHash = "sha256-KE5dFkc4ZXmZMiWKAH3c6oLE3rtgtWDbRq5EZr3RSXE="; subPackages = [ "." ]; diff --git a/pkgs/games/etlegacy/default.nix b/pkgs/games/etlegacy/default.nix new file mode 100644 index 0000000000000..deb10bf3842e5 --- /dev/null +++ b/pkgs/games/etlegacy/default.nix @@ -0,0 +1,138 @@ +{ + stdenv, + lib, + makeWrapper, + writeScriptBin, + fetchFromGitHub, + fetchurl, + runCommand, + cmake, + git, + glew, + SDL2, + zlib, + minizip, + libjpeg, + curl, + lua, + libogg, + libtheora, + freetype, + libpng, + sqlite, + openal, + unzip, + cjson, +}: let + version = "2.81.1"; + pkgname = "etlegacy"; + mirror = "https://mirror.etlegacy.com"; + fetchAsset = { + asset, + sha256, + }: + fetchurl + { + url = mirror + "/etmain/" + asset; + inherit sha256; + }; + pak0 = + fetchAsset + { + asset = "pak0.pk3"; + sha256 = "712966b20e06523fe81419516500e499c86b2b4fec823856ddbd333fcb3d26e5"; + }; + pak1 = + fetchAsset + { + asset = "pak1.pk3"; + sha256 = "5610fd749024405b4425a7ce6397e58187b941d22092ef11d4844b427df53e5d"; + }; + pak2 = + fetchAsset + { + asset = "pak2.pk3"; + sha256 = "a48ab749a1a12ab4d9137286b1f23d642c29da59845b2bafc8f64e052cf06f3e"; + }; + fakeGit = writeScriptBin "git" '' + #! ${stdenv.shell} -e + if [ "$1" = "describe" ]; then + echo "${version}" + fi + ''; + mainProgram = + if stdenv.hostPlatform.system == "i686-linux" + then "etl.i386" + else "etl.x86_64"; +in + stdenv.mkDerivation rec { + pname = pkgname; + inherit version; + + src = fetchFromGitHub { + owner = "etlegacy"; + repo = "etlegacy"; + rev = "refs/tags/v" + version; + sha256 = "sha256-CGXtc51vaId/SHbD34ZeT0gPsrl7p2DEw/Kp+GBZIaA="; # 2.81.1 + }; + + nativeBuildInputs = [cmake fakeGit git makeWrapper unzip cjson]; + buildInputs = [ + glew + SDL2 + zlib + minizip + libjpeg + curl + lua + libogg + libtheora + freetype + libpng + sqlite + openal + ]; + + preBuild = '' + # Required for build time to not be in 1980 + export SOURCE_DATE_EPOCH=$(date +%s) + # This indicates the build was by a CI pipeline and prevents the resource + # files from being flagged as 'dirty' due to potentially being custom built. + export CI="true" + ''; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DCROSS_COMPILE32=0" + "-DBUILD_SERVER=0" + "-DBUILD_CLIENT=1" + "-DBUNDLED_JPEG=0" + "-DBUNDLED_LIBS=0" + "-DINSTALL_EXTRA=0" + "-DINSTALL_OMNIBOT=0" + "-DINSTALL_GEOIP=0" + "-DINSTALL_WOLFADMIN=0" + "-DFEATURE_AUTOUPDATE=0" + "-DINSTALL_DEFAULT_BASEDIR=." + "-DINSTALL_DEFAULT_BINDIR=." + "-DINSTALL_DEFAULT_MODDIR=." + ]; + + postInstall = '' + ETMAIN=$out/etmain + mkdir -p $ETMAIN + ln -s ${pak0} $ETMAIN/pak0.pk3 + ln -s ${pak1} $ETMAIN/pak1.pk3 + ln -s ${pak2} $ETMAIN/pak2.pk3 + makeWrapper $out/${mainProgram} $out/bin/${mainProgram} --chdir $out + ''; + + meta = with lib; { + description = "ET: Legacy is an open source project based on the code of Wolfenstein: Enemy Territory which was released in 2010 under the terms of the GPLv3 license"; + homepage = "https://etlegacy.com"; + platforms = ["i686-linux" "x86_64-linux"]; + license = [licenses.gpl3 licenses.cc-by-nc-sa-30]; + inherit mainProgram; + maintainers = with maintainers; [ashleyghooper]; + }; + } diff --git a/pkgs/games/hase/default.nix b/pkgs/games/hase/default.nix new file mode 100644 index 0000000000000..f807572455afa --- /dev/null +++ b/pkgs/games/hase/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, sparrow3d +, zlib +}: + +stdenv.mkDerivation { + pname = "hase"; + version = "unstable-2020-10-06"; + + src = fetchFromGitHub { + owner = "theZiz"; + repo = "hase"; + rev = "31d6840cdf0c72fc459f10402dae7726096b2974"; + hash = "sha256-d9So3E8nCQJ1/BdlwMkGbaFPT9mkX1VzlDGKp71ptEE="; + }; + + patches = [ ./prefer-dynamic.patch ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + sparrow3d + zlib + ]; + + buildPhase = '' + NIX_CFLAGS_COMPILE=$(pkg-config --cflags sparrow3d zlib) + + # build and install are one step, and inseparable without patching + mkdir -p $out/{bin,share/applications,share/pixmaps} + ./install.sh $out + ''; + + postFixup = '' + substituteInPlace "$out/share/applications/hase.desktop" \ + --replace "Exec=hase" "Exec=$out/bin/hase" + ''; + + meta = { + description = "An open-source artillery shooter"; + longDescription = '' + Hase is an open source gravity based artillery shooter. It is similar to + Worms, Hedgewars or artillery, but the gravity force and direction + depends on the mass nearby. It is optimized for mobile game consoles like + the GP2X, Open Pandora or GCW Zero. + ''; + homepage = "http://ziz.gp2x.de/hase/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ colinsane ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/games/hase/prefer-dynamic.patch b/pkgs/games/hase/prefer-dynamic.patch new file mode 100644 index 0000000000000..ab36e6b2b3d72 --- /dev/null +++ b/pkgs/games/hase/prefer-dynamic.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 95d894e..3c561c1 100644 +--- a/Makefile ++++ b/Makefile +@@ -35,7 +35,7 @@ endif + LIB += -L$(SPARROW_LIB) + INCLUDE += -I$(SPARROW_FOLDER) + +-HASE_STATIC = $(SPARROW_LIB)/$(SPARROW3D_STATIC_LIB) $(SPARROW_LIB)/$(SPARROWSOUND_STATIC_LIB) $(SPARROW_LIB)/$(SPARROWNET_STATIC_LIB) $(STATIC) ++DYNAMIC += -lsparrow3d -lsparrowSound -lsparrowNet + + ifneq ($(TARGET),win32) + DYNAMIC += -lz diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 23a2f707c6b32..a6f95adb9befb 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -114,6 +114,12 @@ in { filesToInstall = ["build/${platform}/release/bl31.bin"]; }; + armTrustedFirmwareAllwinnerH6 = buildArmTrustedFirmware rec { + platform = "sun50i_h6"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = ["build/${platform}/release/bl31.bin"]; + }; + armTrustedFirmwareQemu = buildArmTrustedFirmware rec { platform = "qemu"; extraMeta.platforms = ["aarch64-linux"]; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 91726891d2353..374d299be48a4 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -693,6 +693,25 @@ in rec { }; }; + weather = mkTmuxPlugin { + pluginName = "weather"; + version = "unstable-2020-02-08"; + src = fetchFromGitHub { + owner = "xamut"; + repo = "tmux-weather"; + rev = "28a5fbe75bb25a408193d454304e28ddd75e9338"; + hash = "sha256-of9E/npEsF1JVc9ttwrbC5WkIAwCNBJAgTfExfj79i4="; + }; + + meta = with lib; { + homepage = "https://github.com/xamut/tmux-weather"; + description = "Shows weather in the status line"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ jfvillablanca ]; + }; + }; + yank = mkTmuxPlugin { pluginName = "yank"; version = "unstable-2021-06-20"; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index a360058725006..2832f6c8aee12 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -15,6 +15,7 @@ , swig , which , armTrustedFirmwareAllwinner +, armTrustedFirmwareAllwinnerH6 , armTrustedFirmwareAllwinnerH616 , armTrustedFirmwareRK3328 , armTrustedFirmwareRK3399 @@ -365,6 +366,13 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootOrangePi3 = buildUBoot { + defconfig = "orangepi_3_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareAllwinnerH6}/bl31.bin"; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootPcduino3Nano = buildUBoot { defconfig = "Linksprite_pcDuino3_Nano_defconfig"; extraMeta.platforms = ["armv7l-linux"]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix index 6e659df4d620f..9c7d4f7702fbd 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, appleDerivation, xcbuild, ncurses, libutil }: +{ lib, appleDerivation, xcbuild, ncurses, libutil, Libc }: appleDerivation { # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264 @@ -42,7 +42,7 @@ appleDerivation { ''; nativeBuildInputs = [ xcbuild ]; - buildInputs = [ ncurses libutil ]; + buildInputs = [ ncurses libutil Libc ]; meta = { platforms = lib.platforms.darwin; diff --git a/pkgs/servers/akkoma/akkoma-fe/default.nix b/pkgs/servers/akkoma/akkoma-fe/default.nix index a1f2c43d79ee3..9b6dbdce521c5 100644 --- a/pkgs/servers/akkoma/akkoma-fe/default.nix +++ b/pkgs/servers/akkoma/akkoma-fe/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "akkoma-fe"; - version = "unstable-2023-02-11"; + version = "unstable-2023-03-11"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "akkoma-fe"; - rev = "8569b5946eebdb4e7c91252e1dcf88795c8e2538"; - hash = "sha256-fIkfKAFrcCioma3Hb0c20rfSWXevwWeJbyJm+dUSNlQ="; + rev = "85abc622136c2f346f7855824290f6093afe2794"; + hash = "sha256-EBspufZ92/mLzjdK2R5lpOyrnFataeY/2NabIU0T3Lc="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix index 2b2e73e31c26d..56770a4d35356 100644 --- a/pkgs/servers/akkoma/default.nix +++ b/pkgs/servers/akkoma/default.nix @@ -9,7 +9,7 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "3.6.0"; + version = "3.7.1"; src = fetchFromGitea { domain = "akkoma.dev"; diff --git a/pkgs/servers/akkoma/mix.nix b/pkgs/servers/akkoma/mix.nix index 27d88ec7b9e69..95186f6758d05 100644 --- a/pkgs/servers/akkoma/mix.nix +++ b/pkgs/servers/akkoma/mix.nix @@ -88,12 +88,12 @@ let cachex = buildMix rec { name = "cachex"; - version = "3.5.0"; + version = "3.6.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0jdh08np2d85h57s6718jb5xzjkc882g9knd12xgzn8d43xfphps"; + sha256 = "1qp2r1f4hvpybhgi547p33ci7bh2w6xn6jl9il68xg4370vlxwpb"; }; beamDeps = [ eternal jumper sleeplocks unsafe ]; @@ -114,12 +114,12 @@ let castore = buildMix rec { name = "castore"; - version = "0.1.20"; + version = "0.1.22"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "12n9bb4v9b9sx9xk11k98s4f4a532dmmn0x4ak28dj990mjvf850"; + sha256 = "1b1cl89fzkykimxwgm8mwb9wmxcrd8qk8hfc83pa2npb8zgpcxf1"; }; beamDeps = []; @@ -309,12 +309,12 @@ let earmark = buildMix rec { name = "earmark"; - version = "1.4.34"; + version = "1.4.37"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "012mwv4ixll3gmav9v0wzlin2948ghb2imnp20xi6nyqvbrhdcch"; + sha256 = "01mibj51iys1l289mk2adqs50hfbpfj643mh459nvf4dhq95wvfq"; }; beamDeps = [ earmark_parser ]; @@ -322,12 +322,12 @@ let earmark_parser = buildMix rec { name = "earmark_parser"; - version = "1.4.29"; + version = "1.4.31"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "00rmqvf3hkxfvkijqd624n0hn1xqims8h211xmm02fdi7qdsy0j9"; + sha256 = "0nfhxyklbz0ixkl33xqkchqgdzk948dcjikym0vz0pikw1z3cz9i"; }; beamDeps = []; @@ -478,12 +478,12 @@ let ex_doc = buildMix rec { name = "ex_doc"; - version = "0.29.1"; + version = "0.29.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1xkljn0ggg7fk8qv2dmr2m40h3lmfhi038p2hksdldja6yk5yx5p"; + sha256 = "1bq37vm5sc46k75n1m6h1n42r3czj957xqjh68z7b2m1xlwp2pbb"; }; beamDeps = [ earmark_parser makeup_elixir makeup_erlang ]; @@ -595,12 +595,12 @@ let floki = buildMix rec { name = "floki"; - version = "0.34.0"; + version = "0.34.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1769xg2sqdh6s1j06l7gi98iy35ri79xk6sq58rh1phdyi1ryflw"; + sha256 = "1j6ilik6pviff34rrqr8456h7pp0qlash731pv36ny811w7xbf96"; }; beamDeps = []; @@ -738,12 +738,12 @@ let joken = buildMix rec { name = "joken"; - version = "2.5.0"; + version = "2.6.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1rvlvwgxi7myg5mp1yb0f75gk82yl90660iigg5dhpkwc64mrci2"; + sha256 = "19xanmavc4n5zzypxyi4qd93m8l7sjqswy2ksfmm82ydf5db15as"; }; beamDeps = [ jose ]; @@ -894,12 +894,12 @@ let mint = buildMix rec { name = "mint"; - version = "1.4.2"; + version = "1.5.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "106x9nmzi4ji5cqaddn76pxiyxdihk12z2qgszcdgd2rrjxsaxff"; + sha256 = "07jvgmggmv6bxhkmrskdjz1xvv0a1l53fby7sammcfbwdbky2qsa"; }; beamDeps = [ castore hpax ]; @@ -998,12 +998,12 @@ let open_api_spex = buildMix rec { name = "open_api_spex"; - version = "3.16.0"; + version = "3.16.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0a91jzgq6qp6ba5kxcz8fli2d1l49d8pz8dxikyfhwwbci5f42xv"; + sha256 = "1yyvvyzzi6k2l55fl4wijhrzzdjns95asxcbnikgh6hjmiwdfvzg"; }; beamDeps = [ jason plug poison ]; @@ -1024,12 +1024,12 @@ let phoenix = buildMix rec { name = "phoenix"; - version = "1.6.15"; + version = "1.6.16"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0wh6s8id3b4c4hgiawq995p192wxsws4sr4bm1g7b55kyvxvj2np"; + sha256 = "0fdca3h6k9plv1qvch6zyl6wbnfhp8jisvggjmmsjw7n6kzqjng1"; }; beamDeps = [ castore jason phoenix_pubsub phoenix_view plug plug_cowboy plug_crypto telemetry ]; @@ -1050,12 +1050,12 @@ let phoenix_html = buildMix rec { name = "phoenix_html"; - version = "3.2.0"; + version = "3.3.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0ky5idgid1psz6hmh2b2kmj6n974axww74hrxwv02p6jasx9gv1n"; + sha256 = "1lyhagjpg4lran6431csgkvf28g50mdvh4mlsxgs21j9vmp91ldy"; }; beamDeps = [ plug ]; @@ -1076,12 +1076,12 @@ let phoenix_live_view = buildMix rec { name = "phoenix_live_view"; - version = "0.18.6"; + version = "0.18.17"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0wvbpi16bfn4hxyqs7907aln5di30v3hskzw2ggp1hy38kxnh9yf"; + sha256 = "0f6f7m2naw85qgzh3bsrnwy7l1lwffsbmx3s7g4qv6x234773dgl"; }; beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view telemetry ]; @@ -1115,12 +1115,12 @@ let phoenix_template = buildMix rec { name = "phoenix_template"; - version = "1.0.0"; + version = "1.0.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0ms39n5s6kh532s20yxzj7sh0rz5lslh09ibq5j21lkglacny1hv"; + sha256 = "1vlkd4z2bxinczwcysydidpnh49rpxjihb5k3k4k8qr2yrwc0z8m"; }; beamDeps = [ phoenix_html ]; @@ -1167,12 +1167,12 @@ let plug_crypto = buildMix rec { name = "plug_crypto"; - version = "1.2.3"; + version = "1.2.4"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "18plj2idhp3f0nmqyjjf2rzj849l3br0797m8ln20p5dqscj0rxm"; + sha256 = "1k0sx7c64icxcvgvccnpcszqrjg9a75i535ym6flvjdf7zq1br2d"; }; beamDeps = []; @@ -1492,12 +1492,12 @@ let ueberauth = buildMix rec { name = "ueberauth"; - version = "0.10.3"; + version = "0.10.5"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1lz660mr1sgv302f6qkr85swpd2jgs7255fg70h7zsb4dimg750k"; + sha256 = "1qf97azn8064ymawfm58p2bqpmrigipr4fs5xp3jb8chshqizz9y"; }; beamDeps = [ plug ]; diff --git a/pkgs/tools/backup/fabs/default.nix b/pkgs/tools/backup/fabs/default.nix new file mode 100644 index 0000000000000..9a2a6045c1429 --- /dev/null +++ b/pkgs/tools/backup/fabs/default.nix @@ -0,0 +1,66 @@ +{ lib +, fetchFromGitHub +, perl +, python3 +, sqlite +}: + +python3.pkgs.buildPythonApplication rec { + pname = "fabs"; + version = "1.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "openafs-contrib"; + repo = "fabs"; + rev = "v${version}"; + hash = "sha256-ejAcCwrOWGX0zsMw224f9GTWlozNYC0gU6LdTk0XqH0="; + }; + + nativeBuildInputs = [ + perl + ]; + + propagatedBuildInputs = with python3.pkgs; [ + alembic + dateutil + pyyaml + setuptools + sqlalchemy + ]; + + outputs = [ "out" "man" ]; + + preBuild = '' + export PREFIX=$out + ''; + + LOCALSTATEDIR = "/var"; + LOCKDIR = "/run/lock/fabs"; + + preInstall = '' + mkdir -p "$out/etc" + cp -t "$out/etc" -r etc/fabs + ''; + + # remove once sqlalchemy backend no longer uses deprecated methods + SQLALCHEMY_SILENCE_UBER_WARNING = 1; + + nativeCheckInputs = [ + python3.pkgs.pytestCheckHook + sqlite + ]; + + meta = with lib; { + outputsToInstall = [ "out" "man" ]; + mainProgram = "fabsys"; + description = "Flexible AFS Backup System for the OpenAFS distributed file system"; + homepage = "https://github.com/openafs-contrib/fabs"; + license = with licenses; [ isc ]; + maintainers = with maintainers; [ spacefrogg ]; + badPlatforms = [ + "x86_64-darwin" + "aarch64-darwin" + ]; + }; +} diff --git a/pkgs/tools/backup/tsm-client/default.nix b/pkgs/tools/backup/tsm-client/default.nix index 23a544a6a3e65..80097ade09024 100644 --- a/pkgs/tools/backup/tsm-client/default.nix +++ b/pkgs/tools/backup/tsm-client/default.nix @@ -5,8 +5,7 @@ , fetchurl , autoPatchelfHook , rpmextract -, libxcrypt -, openssl +, libxcrypt-legacy , zlib , lvm2 # LVM image backup and restore functions (optional) , acl # EXT2/EXT3/XFS ACL support (optional) @@ -117,8 +116,7 @@ let rpmextract ]; buildInputs = [ - libxcrypt - openssl + libxcrypt-legacy stdenv.cc.cc zlib ]; @@ -146,7 +144,8 @@ let runHook postInstall ''; - # Fix relative symlinks after `/usr` was moved up one level + # fix relative symlinks after `/usr` was moved up one level, + # fix absolute symlinks pointing to `/opt` preFixup = '' for link in $out/lib{,64}/* $out/bin/* do @@ -158,6 +157,10 @@ let fi ln --symbolic --force --no-target-directory "$out/$(cut -b 7- <<< "$target")" "$link" done + for link in $(find $out -type l -lname '/opt/*') + do + ln --symbolic --force --no-target-directory "$out$(readlink "$link")" "$link" + done ''; }; diff --git a/pkgs/tools/misc/clipboard-jh/default.nix b/pkgs/tools/misc/clipboard-jh/default.nix index a22043ae84fa3..177c0b7a67f3f 100644 --- a/pkgs/tools/misc/clipboard-jh/default.nix +++ b/pkgs/tools/misc/clipboard-jh/default.nix @@ -7,19 +7,24 @@ , wayland-protocols , wayland , xorg +, darwin }: stdenv.mkDerivation rec { pname = "clipboard-jh"; - version = "0.3.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Slackadays"; repo = "clipboard"; rev = version; - sha256 = "sha256-xdogl2WDuQXeLFuBY1u7PSpaoVI9HKScOdxHZ3+whIg="; + hash = "sha256-o3yCWAy7hlFKAFW3tVRG+hL0SRWlNY4hvnhUoDK8GkI="; }; + postPatch = '' + sed -i "/CMAKE_OSX_ARCHITECTURES/d" CMakeLists.txt + ''; + nativeBuildInputs = [ cmake pkg-config @@ -30,6 +35,8 @@ stdenv.mkDerivation rec { wayland-protocols wayland xorg.libX11 + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit ]; cmakeFlags = [ diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index 737679925b2c8..6459af797f739 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.12.1"; + version = "0.12.2"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-VRHcmy1pIn1BrYv9SJieKJxGlM8fKycNQBkwn6Yi7QI="; - aarch64-linux = "sha256-FamkdNYbArqRPCD1tPvSe3YaOlCkmhIPziDlKnz+9Fg="; - x86_64-darwin = "sha256-T595PGfqNyg+rmkS4lI5xN2nUVCrW+u6WRsz+imud64="; - aarch64-darwin = "sha256-Xavks5qx2IVhEDzM/8/pBEPKvdrWeKMJ/KR21puLFXs="; + x86_64-linux = "sha256-8JqteVRGT5UT1AgZeBMFjpTZOU/4/6/ZcJxdWcqU5G8="; + aarch64-linux = "sha256-msVbtcBfDFOjU7BebbtEV05LjBdWDlI1Q/8YEwMbyq0="; + x86_64-darwin = "sha256-ZXz0y6GvoCpeKcPJXV0t828fBBfeFAO+zmUAqCIOysU="; + aarch64-darwin = "sha256-4xnM7k5i4XssQQ6Y0h2hq9s4TLnuazhqXiGQMhR4HNU="; }; in fetchzip { @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; dontPatchShebangs = true; + dontStrip = true; passthru.updateScript = ./update.sh; @@ -64,5 +65,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; maintainers = with maintainers; [ jk techknowlogick ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/alterx/default.nix b/pkgs/tools/security/alterx/default.nix new file mode 100644 index 0000000000000..88f9f52f42146 --- /dev/null +++ b/pkgs/tools/security/alterx/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "alterx"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = "alterx"; + rev = "refs/tags/v${version}"; + hash = "sha256-F60nEkHmmhlRuHI2Hc3no2RvILhVN2oPXgwxpTdPDYM="; + }; + + vendorHash = "sha256-tIXSkNJbbT6X23WCUnB+c0FbxJdV3RF1iOrEJxETeaE="; + + meta = with lib; { + description = "Fast and customizable subdomain wordlist generator using DSL"; + homepage = "https://github.com/projectdiscovery/alterx"; + changelog = "https://github.com/projectdiscovery/alterx/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/kstart/default.nix b/pkgs/tools/security/kstart/default.nix new file mode 100644 index 0000000000000..88ccc960bc9f4 --- /dev/null +++ b/pkgs/tools/security/kstart/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, keyutils +, libkrb5 +, openafs +, perl +, pkg-config +, enableSetPAG ? false +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kstart"; + version = "4.3"; + + src = fetchFromGitHub { + owner = "rra"; + repo = "kstart"; + rev = "release/${finalAttrs.version}"; + hash = "sha256-MGWL4oNc0MZTGWqBEt2wRTkqoagiUTDrS0kz4ewbZZA="; + }; + + nativeBuildInputs = [ + autoreconfHook + perl + pkg-config + ]; + + buildInputs = [ + keyutils + libkrb5 + openafs + ]; + + configureFlags = [ + "--enable-silent-rules" + ] + ++ (lib.optional enableSetPAG "--enable-setpag"); + + preBuild = '' + for f in k5start krenew; do + pod2man --release="${finalAttrs.version}" --center="kstart" docs/"$f".pod >docs/"$f".1 + done + ''; + + doCheck = true; + preCheck = '' + patchShebangs tests + ''; + + outputs = [ "out" "man" ]; + + meta = with lib; { + outputsToInstall = [ "out" "man" ]; + description = "Modified version of kerberos tools that support automatic ticket refresh"; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + }; +}) diff --git a/pkgs/tools/security/vaultwarden/Cargo.lock b/pkgs/tools/security/vaultwarden/Cargo.lock index 6c893cad2c6b0..df4b04f8eac79 100644 --- a/pkgs/tools/security/vaultwarden/Cargo.lock +++ b/pkgs/tools/security/vaultwarden/Cargo.lock @@ -120,7 +120,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.3", + "rustix", "slab", "socket2", "waker-fn", @@ -216,7 +216,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.10", + "syn 2.0.13", ] [[package]] @@ -587,9 +587,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c00419335c41018365ddf7e4d5f1c12ee3659ddcf3e01974650ba1de73d038" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" dependencies = [ "cc", "cxxbridge-flags", @@ -599,9 +599,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb8307ad413a98fff033c8545ecf133e3257747b3bae935e7602aab8aa92d4ca" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" dependencies = [ "cc", "codespan-reporting", @@ -609,24 +609,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.10", + "syn 2.0.13", ] [[package]] name = "cxxbridge-flags" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc52e2eb08915cb12596d29d55f0b5384f00d697a646dbd269b6ecb0fbd9d31" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" [[package]] name = "cxxbridge-macro" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.10", + "syn 2.0.13", ] [[package]] @@ -719,7 +719,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.10", + "syn 2.0.13", ] [[package]] @@ -839,17 +839,6 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" @@ -959,9 +948,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -974,9 +963,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -984,15 +973,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -1001,9 +990,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" @@ -1022,26 +1011,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.13", ] [[package]] name = "futures-sink" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-timer" @@ -1051,9 +1040,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -1082,9 +1071,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -1412,19 +1401,19 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[package]] name = "is-terminal" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" +checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", - "rustix 0.36.11", + "rustix", "windows-sys 0.45.0", ] @@ -1491,9 +1480,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lettre" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8033576bf9f051fce6cb92b6264114b4340896c352a9ff38b67bd4cde924635" +checksum = "76bd09637ae3ec7bd605b8e135e757980b3968430ff2b1a4a94fb7769e50166d" dependencies = [ "async-std", "async-trait", @@ -1562,15 +1551,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] -name = "linux-raw-sys" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" [[package]] name = "lock_api" @@ -1717,9 +1700,9 @@ dependencies = [ [[package]] name = "multer" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed4198ce7a4cbd2a57af78d28c6fbb57d81ac5f1d6ad79ac6c5587419cbdf22" +checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" dependencies = [ "bytes", "encoding_rs", @@ -1729,7 +1712,7 @@ dependencies = [ "log", "memchr", "mime", - "spin 0.9.6", + "spin 0.9.7", "tokio", "tokio-util", "version_check", @@ -1863,9 +1846,9 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "openssl" -version = "0.10.48" +version = "0.10.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" +checksum = "4d2f106ab837a24e03672c59b1239669a0596406ff657c3c0835b6b7f0f35a33" dependencies = [ "bitflags 1.3.2", "cfg-if", @@ -1878,13 +1861,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.13", ] [[package]] @@ -1904,11 +1887,10 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.83" +version = "0.9.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" +checksum = "3a20eace9dc2d82904039cb76dcf50fb1a0bba071cfd1629720b5d6f1ddba0fa" dependencies = [ - "autocfg", "cc", "libc", "openssl-src", @@ -1946,7 +1928,7 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "windows-sys 0.45.0", ] @@ -1997,7 +1979,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.10", + "syn 2.0.13", ] [[package]] @@ -2017,9 +1999,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.6" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7" +checksum = "7b1403e8401ad5dedea73c626b99758535b342502f8d1e361f4a2dd952749122" dependencies = [ "thiserror", "ucd-trie", @@ -2027,9 +2009,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.6" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7" +checksum = "be99c4c1d2fc2769b1d00239431d711d08f6efedcecb8b6e30707160aee99c15" dependencies = [ "pest", "pest_generator", @@ -2037,22 +2019,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.6" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b" +checksum = "e56094789873daa36164de2e822b3888c6ae4b4f9da555a1103587658c805b1e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.13", ] [[package]] name = "pest_meta" -version = "2.5.6" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80" +checksum = "6733073c7cff3d8459fda0e42f13a047870242aed8b509fe98000928975f359e" dependencies = [ "once_cell", "pest", @@ -2178,9 +2160,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.53" +version = "1.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" +checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564" dependencies = [ "unicode-ident", ] @@ -2193,7 +2175,7 @@ checksum = "606c4ba35817e2922a308af55ad51bab3645b59eae5c570d4a6cf07e36bd493b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.10", + "syn 2.0.13", "version_check", "yansi", ] @@ -2311,6 +2293,15 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] name = "ref-cast" version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2327,7 +2318,7 @@ checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.10", + "syn 2.0.13", ] [[package]] @@ -2358,9 +2349,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "reqwest" -version = "0.11.15" +version = "0.11.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ba30cc2c0cd02af1222ed216ba659cdb2f879dfe3181852fe7c50b1d0005949" +checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" dependencies = [ "async-compression", "base64 0.21.0", @@ -2497,7 +2488,7 @@ dependencies = [ "proc-macro2", "quote", "rocket_http", - "syn 2.0.10", + "syn 2.0.13", "unicode-xid", ] @@ -2554,29 +2545,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.11" +version = "0.37.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" +checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" dependencies = [ "bitflags 1.3.2", - "errno 0.2.8", + "errno", "io-lifetimes", "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustix" -version = "0.37.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2" -dependencies = [ - "bitflags 1.3.2", - "errno 0.3.0", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.0", + "linux-raw-sys", "windows-sys 0.45.0", ] @@ -2699,9 +2676,9 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.158" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" dependencies = [ "serde_derive", ] @@ -2718,20 +2695,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.158" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ "proc-macro2", "quote", - "syn 2.0.10", + "syn 2.0.13", ] [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" dependencies = [ "itoa", "ryu", @@ -2862,9 +2839,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34" +checksum = "c0959fd6f767df20b231736396e4f602171e00d95205676286e79d4a4eb67bef" [[package]] name = "stable-pattern" @@ -2909,9 +2886,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.10" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" +checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" dependencies = [ "proc-macro2", "quote", @@ -2933,15 +2910,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", - "rustix 0.36.11", - "windows-sys 0.42.0", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.45.0", ] [[package]] @@ -2970,7 +2947,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.10", + "syn 2.0.13", ] [[package]] @@ -3038,14 +3015,13 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.26.0" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", "parking_lot", @@ -3058,13 +3034,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.13", ] [[package]] @@ -3437,6 +3413,7 @@ dependencies = [ "job_scheduler_ng", "jsonwebtoken", "lettre", + "libmimalloc-sys", "libsqlite3-sys", "log", "mimalloc", diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index a31f5e45c4a82..19dd26b0b3fa2 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -9,13 +9,13 @@ in rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.28.0"; + version = "1.28.1"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - hash = "sha256-ML5eblQUk4xMYbBeLxk9tNxi7N4ltrCjMG0oM9zL6JI="; + hash = "sha256-YIR8if6lFJ+534qBN9k1ltFp5M7KBU5qYaI1KppTYwI="; }; cargoLock = { @@ -28,10 +28,6 @@ rustPlatform.buildRustPackage rec { ++ optional (dbBackend == "mysql") libmysqlclient ++ optional (dbBackend == "postgresql") postgresql; - # vaultwarden depends on rocket v0.5.0-dev, which requires nightly features. - # This may be removed if https://github.com/dani-garcia/vaultwarden/issues/712 is fixed. - RUSTC_BOOTSTRAP = 1; - buildFeatures = dbBackend; passthru = { diff --git a/pkgs/tools/typesetting/pulldown-cmark/default.nix b/pkgs/tools/typesetting/pulldown-cmark/default.nix new file mode 100644 index 0000000000000..69c327c42dda6 --- /dev/null +++ b/pkgs/tools/typesetting/pulldown-cmark/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "pulldown-cmark"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "raphlinus"; + repo = pname; + rev = "v${version}"; + hash = "sha256-AAb+dSJ1oSRuvWu47VvzCeB6pQE6/+u69io2FsZoZHM="; + }; + + cargoHash = "sha256-oOgwZMmrzYBFH1MaE7nMa1SPCACnfqYY3ttOECsnsVY="; + + meta = { + description = "A pull parser for CommonMark written in Rust"; + homepage = "https://github.com/raphlinus/pulldown-cmark"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ CobaltCause ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19cb0de7cbf5a..ed913ad06df22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -260,6 +260,8 @@ with pkgs; aeskeyfind = callPackage ../tools/security/aeskeyfind { }; + alterx = callPackage ../tools/security/alterx { }; + asn = callPackage ../applications/networking/asn { }; asnmap = callPackage ../tools/security/asnmap { }; @@ -1479,6 +1481,8 @@ with pkgs; dwarfs = callPackage ../tools/filesystems/dwarfs { }; + etlegacy = callPackage ../games/etlegacy { lua = lua5_4; }; + copier = callPackage ../tools/misc/copier { }; gamemode = callPackage ../tools/games/gamemode { @@ -1535,6 +1539,8 @@ with pkgs; guestfs-tools = callPackage ../tools/virtualization/guestfs-tools { }; + fabs = callPackage ../tools/backup/fabs { }; + fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { }; headsetcontrol = callPackage ../tools/audio/headsetcontrol { }; @@ -1557,6 +1563,8 @@ with pkgs; ksnip = libsForQt5.callPackage ../tools/misc/ksnip { }; + kstart = callPackage ../tools/security/kstart { }; + kubevirt = callPackage ../tools/virtualization/kubevirt { }; license-generator = callPackage ../tools/misc/license-generator { }; @@ -7033,13 +7041,8 @@ with pkgs; timeline = callPackage ../applications/office/timeline { }; - tsm-client = callPackage ../tools/backup/tsm-client { - openssl = openssl_1_1; - }; - tsm-client-withGui = callPackage ../tools/backup/tsm-client { - openssl = openssl_1_1; - enableGui = true; - }; + tsm-client = callPackage ../tools/backup/tsm-client { }; + tsm-client-withGui = callPackage ../tools/backup/tsm-client { enableGui = true; }; tracker = callPackage ../development/libraries/tracker { }; @@ -11343,6 +11346,8 @@ with pkgs; pubs = callPackage ../tools/misc/pubs { }; + pulldown-cmark = callPackage ../tools/typesetting/pulldown-cmark { }; + pulumictl = callPackage ../development/tools/pulumictl { }; pure-prompt = callPackage ../shells/zsh/pure-prompt { }; @@ -13822,7 +13827,9 @@ with pkgs; clipnotify = callPackage ../tools/misc/clipnotify { }; - clipboard-jh = callPackage ../tools/misc/clipboard-jh { }; + clipboard-jh = callPackage ../tools/misc/clipboard-jh { + stdenv = if stdenv.isDarwin then llvmPackages_15.stdenv else stdenv; + }; clipbuzz = callPackage ../tools/misc/clipbuzz { }; @@ -14354,9 +14361,9 @@ with pkgs; chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; chickenPackages_5 = callPackage ../development/compilers/chicken/5 { }; - chickenPackages = chickenPackages_5; + chickenPackages = dontRecurseIntoAttrs chickenPackages_5; - inherit (chickenPackages) + inherit (chickenPackages_5) fetchegg eggDerivation chicken @@ -18441,6 +18448,8 @@ with pkgs; meraki-cli = python3Packages.callPackage ../tools/admin/meraki-cli { }; + mermerd = callPackage ../development/tools/database/mermerd { }; + python-matter-server = with python3Packages; toPythonApplication python-matter-server; minify = callPackage ../development/web/minify { }; @@ -19896,7 +19905,7 @@ with pkgs; ffmpeg_4-headless = ffmpeg_4.override { ffmpegVariant = "headless"; }; - ffmpeg_4-full = ffmpeg.override { + ffmpeg_4-full = ffmpeg_4.override { ffmpegVariant = "full"; }; @@ -23702,6 +23711,8 @@ with pkgs; spaceship-prompt = callPackage ../shells/zsh/spaceship-prompt { }; + sparrow3d = callPackage ../development/libraries/sparrow3d {}; + spdk = callPackage ../development/libraries/spdk { }; speechd = callPackage ../development/libraries/speechd { }; @@ -26163,6 +26174,7 @@ with pkgs; armTrustedFirmwareTools armTrustedFirmwareAllwinner armTrustedFirmwareAllwinnerH616 + armTrustedFirmwareAllwinnerH6 armTrustedFirmwareQemu armTrustedFirmwareRK3328 armTrustedFirmwareRK3399 @@ -26944,6 +26956,8 @@ with pkgs; gosec = callPackage ../development/tools/gosec { }; + gotraceui = callPackage ../development/tools/gotraceui { }; + govers = callPackage ../development/tools/govers { }; govendor = callPackage ../development/tools/govendor { }; @@ -27358,6 +27372,7 @@ with pkgs; ubootOdroidC2 ubootOdroidXU3 ubootOlimexA64Olinuxino + ubootOrangePi3 ubootOrangePiPc ubootOrangePiZeroPlus2H5 ubootOrangePiZero @@ -28382,6 +28397,8 @@ with pkgs; sweet = callPackage ../data/themes/sweet { }; + sweet-nova = callPackage ../data/themes/sweet-nova { }; + shared-mime-info = callPackage ../data/misc/shared-mime-info { }; shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { }; @@ -36004,6 +36021,8 @@ with pkgs; harmonist = callPackage ../games/harmonist { }; + hase = callPackage ../games/hase { }; + hedgewars = libsForQt5.callPackage ../games/hedgewars { inherit (haskellPackages) ghcWithPackages; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 719fb88362ab1..35079718420c6 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -124,6 +124,7 @@ mapAliases ({ hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29 IMAPClient = imapclient; # added 2021-10-28 imdbpy = throw "imdbpy has been renamed to cinemagoer"; # added 2022-08-08 + intreehook = throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 itanium_demangler = itanium-demangler; # added 2022-1017 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6eb76522dd605..eb19d5b1df761 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4804,8 +4804,6 @@ self: super: with self; { into-dbus-python = callPackage ../development/python-modules/into-dbus-python { }; - intreehooks = callPackage ../development/python-modules/intreehooks { }; - invisible-watermark = callPackage ../development/python-modules/invisible-watermark { }; invocations = callPackage ../development/python-modules/invocations { }; |