diff options
159 files changed, 5835 insertions, 1073 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7a23ed1a4cd..bc349cd9d50 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -796,6 +796,12 @@ githubId = 718812; name = "Antoine R. Dumont"; }; + arezvov = { + email = "alex@rezvov.ru"; + github = "arezvov"; + githubId = 58516559; + name = "Alexander Rezvov"; + }; arianvp = { email = "arian.vanputten@gmail.com"; github = "arianvp"; @@ -902,6 +908,12 @@ githubId = 869771; name = "Kirill Boltaev"; }; + ashley = { + email = "personavinny@protonmail.com"; + github = "paranoidcat"; + githubId = 84152630; + name = "Ashley Chiara"; + }; asppsa = { email = "asppsa@gmail.com"; github = "asppsa"; @@ -6438,12 +6450,6 @@ githubId = 2649304; name = "M. Baeten"; }; - mbakke = { - email = "mbakke@fastmail.com"; - github = "mbakke"; - githubId = 1269099; - name = "Marius Bakke"; - }; mbaillie = { email = "martin@baillie.id"; github = "martinbaillie"; @@ -8193,6 +8199,12 @@ githubId = 1829032; name = "Paul Hendry"; }; + polygon = { + email = "polygon@wh2.tu-dresden.de"; + name = "Polygon"; + github = "polygon"; + githubId = 51489; + }; polyrod = { email = "dc1mdp@gmail.com"; github = "polyrod"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 781734a189a..35f8f91a21b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -232,6 +232,75 @@ <literal>services.x2goserver</literal> </para> </listitem> + <listitem> + <para> + The following dotnet-related packages have been removed for + being unmaintaned. Please use <literal>fetchNuGet</literal> + for specific packages. + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + Autofac + </para> + </listitem> + <listitem> + <para> + SystemValueTuple + </para> + </listitem> + <listitem> + <para> + MicrosoftDiaSymReader + </para> + </listitem> + <listitem> + <para> + MicrosoftDiaSymReaderPortablePdb + </para> + </listitem> + <listitem> + <para> + SystemCollectionsImmutable + </para> + </listitem> + <listitem> + <para> + SystemCollectionsImmutable131 + </para> + </listitem> + <listitem> + <para> + SystemReflectionMetadata + </para> + </listitem> + <listitem> + <para> + NUnit350 + </para> + </listitem> + <listitem> + <para> + Deedle + </para> + </listitem> + <listitem> + <para> + ExcelDna + </para> + </listitem> + <listitem> + <para> + GitVersionTree + </para> + </listitem> + <listitem> + <para> + NDeskOptions + </para> + </listitem> + </itemizedlist> + </listitem> </itemizedlist> </section> <section xml:id="other-notable-changes"> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 3a29b29f106..a199bcfef35 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -66,4 +66,19 @@ In addition to numerous new and upgraded packages, this release has the followin * `programs.x2goserver` is now `services.x2goserver` +* The following dotnet-related packages have been removed for being unmaintaned. + Please use `fetchNuGet` for specific packages. + - Autofac + - SystemValueTuple + - MicrosoftDiaSymReader + - MicrosoftDiaSymReaderPortablePdb + - SystemCollectionsImmutable + - SystemCollectionsImmutable131 + - SystemReflectionMetadata + - NUnit350 + - Deedle + - ExcelDna + - GitVersionTree + - NDeskOptions + ## Other Notable Changes diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index 59bc9e9d11e..a37b46b8c46 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -114,6 +114,19 @@ let ''; }; + discardPolicy = mkOption { + default = null; + example = "once"; + type = types.nullOr (types.enum ["once" "pages" "both" ]); + description = '' + Specify the discard policy for the swap device. If "once", then the + whole swap space is discarded at swapon invocation. If "pages", + asynchronous discard on freed pages is performed, before returning to + the available pages pool. With "both", both policies are activated. + See swapon(8) for more information. + ''; + }; + deviceName = mkOption { type = types.str; internal = true; diff --git a/nixos/modules/services/desktops/espanso.nix b/nixos/modules/services/desktops/espanso.nix index cd2eadf8816..4ef6724dda0 100644 --- a/nixos/modules/services/desktops/espanso.nix +++ b/nixos/modules/services/desktops/espanso.nix @@ -12,7 +12,6 @@ in { config = mkIf cfg.enable { systemd.user.services.espanso = { description = "Espanso daemon"; - path = with pkgs; [ espanso libnotify xclip ]; serviceConfig = { ExecStart = "${pkgs.espanso}/bin/espanso daemon"; Restart = "on-failure"; diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 1e33381de24..c8ffead7b1a 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -66,7 +66,9 @@ in { meta.maintainers = teams.home-assistant.members; options.services.home-assistant = { - enable = mkEnableOption "Home Assistant"; + # Running home-assistant on NixOS is considered an installation method that is unsupported by the upstream project. + # https://github.com/home-assistant/architecture/blob/master/adr/0012-define-supported-installation-method.md#decision + enable = mkEnableOption "Home Assistant. Please note that this installation method is unsupported upstream"; configDir = mkOption { default = "/var/lib/hass"; diff --git a/nixos/modules/services/networking/solanum.nix b/nixos/modules/services/networking/solanum.nix index b6496fb8b35..dc066a24549 100644 --- a/nixos/modules/services/networking/solanum.nix +++ b/nixos/modules/services/networking/solanum.nix @@ -2,7 +2,7 @@ let inherit (lib) mkEnableOption mkIf mkOption types; - inherit (pkgs) solanum; + inherit (pkgs) solanum util-linux; cfg = config.services.solanum; configFile = pkgs.writeText "solanum.conf" cfg.config; @@ -78,12 +78,20 @@ in config = mkIf cfg.enable (lib.mkMerge [ { + + environment.etc."solanum/ircd.conf".source = configFile; + systemd.services.solanum = { description = "Solanum IRC daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + reloadIfChanged = true; + restartTriggers = [ + configFile + ]; serviceConfig = { - ExecStart = "${solanum}/bin/solanum -foreground -logfile /dev/stdout -configfile ${configFile} -pidfile /run/solanum/ircd.pid"; + ExecStart = "${solanum}/bin/solanum -foreground -logfile /dev/stdout -configfile /etc/solanum/ircd.conf -pidfile /run/solanum/ircd.pid"; + ExecReload = "${util-linux}/bin/kill -HUP $MAINPID"; DynamicUser = true; User = "solanum"; StateDirectory = "solanum"; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 089c7a12afb..227dfe834b2 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -41,6 +41,10 @@ let Warning: If you are using <literal>NixOps</literal> then don't use this option since it will replace the key required for deployment via ssh. ''; + example = [ + "ssh-rsa AAAAB3NzaC1yc2etc/etc/etcjwrsh8e596z6J0l7 example@host" + "ssh-ed25519 AAAAC3NzaCetcetera/etceteraJZMfk3QPfQ foo@bar" + ]; }; keyFiles = mkOption { @@ -252,7 +256,17 @@ in authorizedKeysFiles = mkOption { type = types.listOf types.str; default = []; - description = "Files from which authorized keys are read."; + description = '' + Specify the rules for which files to read on the host. + + This is an advanced option. If you're looking to configure user + keys, you can generally use <xref linkend="opt-users.users._name_.openssh.authorizedKeys.keys"/> + or <xref linkend="opt-users.users._name_.openssh.authorizedKeys.keyFiles"/>. + + These are paths relative to the host root file system or home + directories and they are subject to certain token expansion rules. + See AuthorizedKeysFile in man sshd_config for details. + ''; }; authorizedKeysCommand = mkOption { diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 2949c82df8f..d274a38a270 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -254,8 +254,11 @@ in skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck; # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; - swapOptions = sw: "defaults" - + optionalString (sw.priority != null) ",pri=${toString sw.priority}"; + swapOptions = sw: concatStringsSep "," ( + [ "defaults" ] + ++ optional (sw.priority != null) "pri=${toString sw.priority}" + ++ optional (sw.discardPolicy != null) "discard${optionalString (sw.discardPolicy != "both") "=${toString sw.discardPolicy}"}" + ); in '' # This is a generated file. Do not edit! # diff --git a/nixos/tests/solanum.nix b/nixos/tests/solanum.nix index aabfb906aa8..1ecf91bce40 100644 --- a/nixos/tests/solanum.nix +++ b/nixos/tests/solanum.nix @@ -16,6 +16,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { networking.firewall.allowedTCPPorts = [ ircPort ]; services.solanum = { enable = true; + motd = '' + The default MOTD doesn't contain the word "nixos" in it. + This one does. + ''; }; }; } // lib.listToAttrs (builtins.map (client: lib.nameValuePair client { @@ -48,6 +52,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { ${client}.wait_for_unit("ii") ${client}.wait_for_file("${iiDir}/${server}/out") '' + # look for the custom text in the MOTD. + '' + ${client}.wait_until_succeeds("grep 'nixos' ${iiDir}/${server}/out") + '' # wait until first PING from server arrives before joining, # so we don't try it too early '' diff --git a/pkgs/applications/audio/songrec/default.nix b/pkgs/applications/audio/songrec/default.nix index 2928771b3ec..ccedb4c069e 100644 --- a/pkgs/applications/audio/songrec/default.nix +++ b/pkgs/applications/audio/songrec/default.nix @@ -25,6 +25,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ alsa-lib gtk3 openssl ffmpeg ]; + postInstall = '' + mv packaging/rootfs/usr/share $out/share + ''; + meta = with lib; { description = "An open-source Shazam client for Linux, written in Rust"; homepage = "https://github.com/marin-m/SongRec"; diff --git a/pkgs/applications/editors/emacs/27.nix b/pkgs/applications/editors/emacs/27.nix index b629c2d2120..e0e41a78b9c 100644 --- a/pkgs/applications/editors/emacs/27.nix +++ b/pkgs/applications/editors/emacs/27.nix @@ -1,7 +1,12 @@ import ./generic.nix (rec { version = "27.2"; sha256 = "sha256-tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk="; - patches = [ + patches = fetchpatch: [ ./tramp-detect-wrapped-gvfsd.patch + (fetchpatch { + name = "fix-aarch64-darwin-triplet.patch"; + url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=a88f63500e475f842e5fbdd9abba4ce122cdb082"; + sha256 = "sha256-RF9b5PojFUAjh2TDUW4+HaWveV30Spy1iAXhaWf1ZVg="; + }) ]; }) diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 1bae0a0c970..bcd55258a49 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -10,7 +10,7 @@ , Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf -, jansson, harfbuzz +, sigtool, jansson, harfbuzz , dontRecurseIntoAttrs ,emacsPackagesFor , libgccjit, targetPlatform, makeWrapper # native-comp params , systemd ? null @@ -46,10 +46,10 @@ assert withXwidgets -> withGTK3 && webkitgtk != null; let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; -} // lib.optionalAttrs stdenv.isDarwin { - CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=101200"; } // { - inherit pname version patches; + inherit pname version; + + patches = patches fetchpatch; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.xz"; @@ -118,8 +118,8 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ++ lib.optional (withX && withMotif) motif ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ] ++ lib.optionals withNS [ AppKit GSS ImageIO ] - ++ lib.optionals nativeComp [ libgccjit ] - ; + ++ lib.optionals stdenv.isDarwin [ sigtool ] + ++ lib.optionals nativeComp [ libgccjit ]; hardeningDisable = [ "format" ]; @@ -138,7 +138,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ++ lib.optional withXwidgets "--with-xwidgets" ++ lib.optional nativeComp "--with-native-compilation" ++ lib.optional withImageMagick "--with-imagemagick" - ; + ; installTargets = [ "tags" "install" ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index e72d2df43a9..38ea3054a60 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -307,12 +307,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2020.3.3"; /* updated by script */ + version = "2021.1"; /* updated by script */ description = "Create your own domain-specific language"; license = lib.licenses.asl20; src = fetchurl { - url = "https://download.jetbrains.com/mps/2020.3/MPS-${version}.tar.gz"; - sha256 = "0sb50f7d4272dzx84njc326xvhbqn3xwrphvdq4zl3pk3wl8f4nz"; /* updated by script */ + url = "https://download.jetbrains.com/mps/${version}/MPS-${version}.tar.gz"; + sha256 = "0fdh8lzsi2zryi0xs961vrf3l8kqk5imlj56dhifywi7xkhs3vwn"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -320,12 +320,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "02s75fqd9hfh302zha4jw6qynpgm9nkrlq7s78nk3fc3d3hw8v5y"; /* updated by script */ + sha256 = "05hjv1nz1b82bkakadjvsy23v0qv8fyni6h31lcg9198h1890f7v"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -333,12 +333,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "04bs9sz872b0h1zzax23irvj6q5wxnzp6fl4f177j94kh4116cqh"; /* updated by script */ + sha256 = "0sp7w1xrl0y36dai08kqfd0jk06yr7jdbaf1a9f3fgxp5pmspxp1"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -346,12 +346,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0wc9j7nilakmm7scf7a71zb3k9vixgih05ni3n3pp4iznvwb3nxg"; /* updated by script */ + sha256 = "0ny7rbl8g5azpqnlcq8l6bwh6hrp8rgp06lf4a8gdr9rpvw9xsqb"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -372,12 +372,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "05sfjf5523idsl7byc7400r4xqv1d65gpmkh5x0lbgf1k3bx2wlm"; /* updated by script */ + sha256 = "0r80y8y38rdxgc9sim0q2p7bmgxlp4pdxydr0w9gjikwnjxnvz51"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl index 6f0a451849a..cd3d2193a28 100755 --- a/pkgs/applications/editors/jetbrains/update.pl +++ b/pkgs/applications/editors/jetbrains/update.pl @@ -61,8 +61,9 @@ sub update_nix_block { # try to interpret some nix my ($name) = $block =~ /name\s*=\s*"([^"]+)"/; $name =~ s/\$\{version\}/$latest_versions{$channel}/; - $url =~ s/\$\{name\}/$name/; - $url =~ s/\$\{version\}/$latest_versions{$channel}/; + # Some url paattern contain variables more than once + $url =~ s/\$\{name\}/$name/g; + $url =~ s/\$\{version\}/$latest_versions{$channel}/g; die "$url still has some interpolation" if $url =~ /\$/; my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; my $version_string = $latest_versions{$channel}; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 1a92ca3decb..bd61933b38d 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "5.7"; + version = "5.8"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "1ynarilx0ca0a5h6hl5bf276cymyy8s9wr5l24vyy7f15v683cfl"; + sha256 = "133nhxg4xfxisjzi85rn2l575hdbvcax1s13l4m6wcvq5zdn6fz4"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 4215b20180e..5e1d9dc9cb8 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -175,7 +175,8 @@ in stdenv.mkDerivation rec { ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc '' + lib.optionalString wrapPythonDrv '' - wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin" + wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin" \ + --set NIX_PYTHONPATH "${python3}/${python3.sitePackages}" '' + lib.optionalString (guiSupport == "gtk3") '' rewrap () { diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index fe09345349e..b4beab05acd 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,8 +1,6 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake -, makeWrapper , qttools , darwin @@ -43,13 +41,13 @@ with lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.6.4"; + version = "2.6.6"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "02ajfkw818cmalvkl0kqvza85rgdgs59kw2v7b3c4v8kv00c41j3"; + sha256 = "15rm3avdmc2x2n92zq6w1zbcranak4j6dds2sxmgdqi1ffc0a3ci"; }; NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang [ @@ -92,10 +90,9 @@ stdenv.mkDerivation rec { runHook postCheck ''; - nativeBuildInputs = [ cmake wrapQtAppsHook qttools pkg-config ]; + nativeBuildInputs = [ asciidoctor cmake wrapQtAppsHook qttools pkg-config ]; buildInputs = [ - asciidoctor curl glibcLocales libXi diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index af42466d0ea..16937fa57b0 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -134,7 +134,7 @@ let tornado unidecode watchdog - websocket_client + websocket-client werkzeug wrapt zeroconf diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 33a37e32612..d47d1fe26a6 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Window switcher, run dialog and dmenu replacement"; homepage = "https://github.com/davatorium/rofi"; license = licenses.mit; - maintainers = with maintainers; [ mbakke ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index ebfaaa1db51..6d9d9deefa2 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -59,7 +59,7 @@ python3Packages.buildPythonApplication rec { python-Levenshtein pyxdg requests - websocket_client + websocket-client ]; checkInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 35a999e762b..68ca4a13e44 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "91.0.4472.101", - "sha256": "1d3y621iclkq6nvxrapk5aihv50x13hjha0c2gcp2xxfma96253q", - "sha256bin64": "12j5q5b9v0jpiznjnh89831w8lv399vd1z4ljhbsnsidbsygrbr1", + "version": "91.0.4472.106", + "sha256": "1fxy1l2dl0f6v8566lykcng18ma6fv4nlwxmdb0hh06fgp6khpjl", + "sha256bin64": "11l88fqrl1r7b02j78zgrr6kajayl8kw8mb8b91ard18w5kz1xvd", "deps": { "gn": { "version": "2021-04-06", @@ -12,9 +12,9 @@ } }, "chromedriver": { - "version": "91.0.4472.19", - "sha256_linux": "0pg9y55644i87qxa0983lvfizbmfiak9bg9249xhifl5kykghrb2", - "sha256_darwin": "07v5k07100vrzsbm6r59xg8j80ffzs3gnnf2kcfgqrzprx284gf2" + "version": "91.0.4472.101", + "sha256_linux": "0dzx565z2rd0y4i57rv5kd7dsm69sffza96y3c773hqaghm4y1ng", + "sha256_darwin": "0nff1jmmrn6a4clfvhyzrhfp8hx85z72563jwk28apflqmnm0k68" } }, "beta": { diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 436bccba47a..f15cf6c81b4 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-W7uSyApTKBTE7bgprgCd8T5dKQ/nLYKIzFxjDMCRmZQ="; + sha256 = "sha256-NjiTjY2YuxUs/Wny7aDqHGw/2ML1fenjHrl089rLXFI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6e8a80ebdd5..3afce9ce1ab 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -513,10 +513,10 @@ "owner": "Mongey", "provider-source-address": "registry.terraform.io/Mongey/kafka", "repo": "terraform-provider-kafka", - "rev": "v0.2.12", - "sha256": "0jm592chliiph5643rymzpwnlcq7q6bpwg2h86x5qmbzbiyqsi83", - "vendorSha256": "08wg16g4mvn6kl8xwn89195a826cb132ijvrgf32c6p7zp4lgmjd", - "version": "0.2.12" + "rev": "v0.3.3", + "sha256": "10il2mmsrk27zgzdkwn495sfhlad2nnc2xa7qzn7rlqzh92bb8rb", + "vendorSha256": "1gxx561s7jghiq6kqb2nns52bbcp0ks2dylrb1lvy7g2798cpspf", + "version": "0.3.3" }, "kafka-connect": { "owner": "Mongey", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 66185b2cc3d..739b1e2737d 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,10 +1,21 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, coreutils -, runCommand, runtimeShell, writeText, terraform-providers, fetchpatch }: +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, coreutils +, runCommand +, runtimeShell +, writeText +, terraform-providers +, fetchpatch +}: let generic = { version, sha256, vendorSha256 ? null, ... }@attrs: let attrs' = builtins.removeAttrs attrs [ "version" "sha256" "vendorSha256" ]; - in buildGoModule ({ + in + buildGoModule ({ name = "terraform-${version}"; inherit vendorSha256; @@ -62,33 +73,37 @@ let actualPlugins = plugins terraform.plugins; # Make providers available in Terraform 0.13 and 0.12 search paths. - pluginDir = lib.concatMapStrings (pl: let - inherit (pl) version GOOS GOARCH; + pluginDir = lib.concatMapStrings + (pl: + let + inherit (pl) version GOOS GOARCH; - pname = pl.pname or (throw "${pl.name} is missing a pname attribute"); + pname = pl.pname or (throw "${pl.name} is missing a pname attribute"); - # This is just the name, without the terraform-provider- prefix - plugin_name = lib.removePrefix "terraform-provider-" pname; + # This is just the name, without the terraform-provider- prefix + plugin_name = lib.removePrefix "terraform-provider-" pname; - slug = pl.passthru.provider-source-address or "registry.terraform.io/nixpkgs/${plugin_name}"; + slug = pl.passthru.provider-source-address or "registry.terraform.io/nixpkgs/${plugin_name}"; - shim = writeText "shim" '' - #!${runtimeShell} - exec ${pl}/bin/${pname}_v${version} "$@" - ''; - in '' - TF_0_13_PROVIDER_PATH=$out/plugins/${slug}/${version}/${GOOS}_${GOARCH}/${pname}_v${version} - mkdir -p "$(dirname $TF_0_13_PROVIDER_PATH)" + shim = writeText "shim" '' + #!${runtimeShell} + exec ${pl}/bin/${pname}_v${version} "$@" + ''; + in + '' + TF_0_13_PROVIDER_PATH=$out/plugins/${slug}/${version}/${GOOS}_${GOARCH}/${pname}_v${version} + mkdir -p "$(dirname $TF_0_13_PROVIDER_PATH)" - cp ${shim} "$TF_0_13_PROVIDER_PATH" - chmod +x "$TF_0_13_PROVIDER_PATH" + cp ${shim} "$TF_0_13_PROVIDER_PATH" + chmod +x "$TF_0_13_PROVIDER_PATH" - TF_0_12_PROVIDER_PATH=$out/plugins/${pname}_v${version} + TF_0_12_PROVIDER_PATH=$out/plugins/${pname}_v${version} - cp ${shim} "$TF_0_12_PROVIDER_PATH" - chmod +x "$TF_0_12_PROVIDER_PATH" - '' - ) actualPlugins; + cp ${shim} "$TF_0_12_PROVIDER_PATH" + chmod +x "$TF_0_12_PROVIDER_PATH" + '' + ) + actualPlugins; # Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries wrapperInputs = lib.unique (lib.flatten @@ -110,9 +125,10 @@ let }; # Don't bother wrapping unless we actually have plugins, since the wrapper will stop automatic downloading # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform. - in if actualPlugins == [ ] then + in + if actualPlugins == [ ] then terraform.overrideAttrs - (orig: { passthru = orig.passthru // passthru; }) + (orig: { passthru = orig.passthru // passthru; }) else lib.appendToName "with-plugins" (stdenv.mkDerivation { inherit (terraform) name meta; @@ -127,76 +143,47 @@ let inherit passthru; }); - in withPlugins (_: [ ]); + in + withPlugins (_: [ ]); plugins = removeAttrs terraform-providers [ "override" "overrideDerivation" "recurseForDerivations" ]; -in rec { - terraform_0_12 = pluggable (generic { - version = "0.12.31"; - sha256 = "03p698xdbk5gj0f9v8v1fpd74zng3948dyy4f2hv7zgks9hid7fg"; - patches = [ - ./provider-path.patch - (fetchpatch { - name = "fix-mac-mojave-crashes.patch"; - url = "https://github.com/hashicorp/terraform/commit/cd65b28da051174a13ac76e54b7bb95d3051255c.patch"; - sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs"; - }) ]; - passthru = { inherit plugins; }; - }); - - terraform_0_13 = pluggable (generic { - version = "0.13.7"; - sha256 = "1cahnmp66dk21g7ga6454yfhaqrxff7hpwpdgc87cswyq823fgjn"; - patches = [ ./provider-path.patch ]; - passthru = { inherit plugins; }; - }); - - terraform_0_14 = pluggable (generic { - version = "0.14.11"; - sha256 = "1yi1jj3n61g1kn8klw6l78shd23q79llb7qqwigqrx3ki2mp279j"; - vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm"; - patches = [ ./provider-path.patch ]; - passthru = { inherit plugins; }; - }); +in +rec { + # Constructor for other terraform versions + mkTerraform = attrs: pluggable (generic attrs); - terraform_0_15 = pluggable (generic { - version = "0.15.5"; - sha256 = "18f4a6l24s3cym7gk40agxikd90i56q84wziskw1spy9rgv2yx6d"; - vendorSha256 = "12hrpxay6k3kz89ihyhl91c4lw4wp821ppa245w9977fq09fhnx0"; - patches = [ ./provider-path-0_15.patch ]; - passthru = { inherit plugins; }; - }); - - terraform_1_0_0 = pluggable (generic { + terraform_1_0 = mkTerraform { version = "1.0.0"; sha256 = "sha256-ddcT/I2Qn1pKFyhXgh+CcD3fSv2steSNmjyyiS2SE/o="; vendorSha256 = "sha256-oFvoEsDunJR4IULdGwS6nHBKWEgUehgT+nNM41W/GYo="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; - }); + }; # Tests that the plugins are being used. Terraform looks at the specific # file pattern and if the plugin is not found it will try to download it # from the Internet. With sandboxing enable this test will fail if that is # the case. - terraform_plugins_test = let - mainTf = writeText "main.tf" '' - resource "random_id" "test" {} - ''; - terraform = terraform_0_12.withPlugins (p: [ p.random ]); - test = - runCommand "terraform-plugin-test" { buildInputs = [ terraform ]; } '' - set -e - # make it fail outside of sandbox - export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0 - cp ${mainTf} main.tf - terraform init - touch $out + terraform_plugins_test = + let + mainTf = writeText "main.tf" '' + resource "random_id" "test" {} ''; - in test; + terraform = terraform_1_0.withPlugins (p: [ p.random ]); + test = + runCommand "terraform-plugin-test" { buildInputs = [ terraform ]; } '' + set -e + # make it fail outside of sandbox + export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0 + cp ${mainTf} main.tf + terraform init + touch $out + ''; + in + test; } diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 2c3deff9f15..e78fa38f909 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.29.9"; + version = "0.30.3"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xgoKxA8lc72yhFVHeFkbF5j5/vGAd9TTaJ/aDEYL8Wg="; + sha256 = "sha256-kGeGqn0Jgim3gpZUwhIMPV84XD8yYEyH5YMtzidxWRU="; }; - vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8="; + vendorSha256 = "sha256-OgNNq1qRhCufcWemLxh50pzs432RxZpWWcyBB7xeiOs="; doCheck = false; diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix index ba1837ee96f..8ff5c50b8a7 100644 --- a/pkgs/applications/networking/irc/convos/default.nix +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -6,13 +6,13 @@ with lib; perlPackages.buildPerlPackage rec { pname = "convos"; - version = "6.11"; + version = "6.24"; src = fetchFromGitHub { owner = "convos-chat"; repo = pname; rev = "v${version}"; - sha256 = "19nzm7f3glvj34nj9pvnp0h9xx6baq58c11ddkqfmq7w3sci49hi"; + sha256 = "0hrz74fybypkjf9hraknylxrhnz7bhk00pk6wla2wfg8s2798zlx"; }; nativeBuildInputs = [ makeWrapper ] diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 698ee80edf6..aebe906659e 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { env = "${buildEnv { name = "wee-slack-env"; paths = with python3Packages; [ - websocket_client + websocket-client six ]; }}/${python3Packages.python.sitePackages}"; diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix index 4440b24a2b1..19da740938c 100644 --- a/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/pkgs/applications/networking/p2p/zeronet/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket_client + gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket-client gevent-websocket rencode bitcoinlib maxminddb pyopenssl ]; diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index 5cbfa5b1b2a..adeb087ae8b 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -10,6 +10,7 @@ , openssl , xclip , xdotool +, makeWrapper }: rustPlatform.buildRustPackage rec { @@ -28,6 +29,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ extra-cmake-modules pkg-config + makeWrapper ]; buildInputs = [ @@ -35,6 +37,7 @@ rustPlatform.buildRustPackage rec { libXtst libXi libnotify + xclip openssl xdotool ]; @@ -42,6 +45,11 @@ rustPlatform.buildRustPackage rec { # Some tests require networking doCheck = false; + postInstall = '' + wrapProgram $out/bin/espanso \ + --prefix PATH : ${lib.makeBinPath [ libnotify xclip ]} + ''; + meta = with lib; { description = "Cross-platform Text Expander written in Rust"; homepage = "https://espanso.org"; diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/applications/science/biology/truvari/default.nix index fffeca2c740..31c1fc50ee3 100644 --- a/pkgs/applications/science/biology/truvari/default.nix +++ b/pkgs/applications/science/biology/truvari/default.nix @@ -5,15 +5,20 @@ python3Packages.buildPythonApplication rec { pname = "truvari"; - version = "2.0.2"; + version = "2.1.1"; src = fetchFromGitHub { owner = "spiralgenetics"; repo = "truvari"; rev = "v${version}"; - sha256 = "0lp1wnldjv92k4ncga1h0icb0dpjsrx427vggg40x04a7kp9lwx0"; + sha256 = "14nsdbj063qm175xxixs34cihvsiskc9gym8pg7gbwsh13k5a00h"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'python-Levenshtein==0.12.1' 'python-Levenshtein>=0.12.1' + ''; + propagatedBuildInputs = with python3Packages; [ pyvcf python-Levenshtein diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 77ad7d8658d..95060714c24 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diff-so-fancy"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "sha256-bV22x459QerWg4MVLWsXPDhM38QWG6BE+dVmKIFfDiE="; + sha256 = "sha256-1kBarsRiuB8fv7VLlWfpotPfHeMrfmIXHXTFu8TzC2A="; }; nativeBuildInputs = [ @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { diff-so-fancy builds on the good-lookin' output of git contrib's diff-highlight to upgrade your diffs' appearances. ''; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ fpletz globin ma27 ]; }; } diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index d7e6261a932..60596eee4a9 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.12.3", - "repo_hash": "0kpdl1gwcxy13lwyl96nsia62wysrnxdygil6sz6s72hg0y2fsgr", + "version": "13.12.4", + "repo_hash": "1jp97vwwfnh3iqkh58y0zqcx6lsvqcpnxy8ipd4j9hbmag1jr36i", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.12.3-ee", + "rev": "v13.12.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.12.3", + "GITALY_SERVER_VERSION": "13.12.4", "GITLAB_PAGES_VERSION": "1.39.0", "GITLAB_SHELL_VERSION": "13.18.0", - "GITLAB_WORKHORSE_VERSION": "13.12.3" + "GITLAB_WORKHORSE_VERSION": "13.12.4" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 6276dd75eaf..8f189338e61 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -21,14 +21,14 @@ let }; }; in buildGoModule rec { - version = "13.12.3"; + version = "13.12.4"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-qqLVYNCE8rKPBY5tj6AAoWcyIEtQZkO980NVPg0WO18="; + sha256 = "sha256-5I06tzeOfVdtblgqI7neKBgwzXuU9hI/0V3gYEPMJJ0="; }; vendorSha256 = "sha256-drS0L0olEFHYJVC0VYwEZeNYa8fjwrfxlhrEQa4pqzY="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index e900a6522eb..2eb1d14d0a4 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "13.12.3"; + version = "13.12.4"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/video/flowblade/default.nix b/pkgs/applications/video/flowblade/default.nix new file mode 100644 index 00000000000..2e50dfa1218 --- /dev/null +++ b/pkgs/applications/video/flowblade/default.nix @@ -0,0 +1,45 @@ +{ lib, fetchFromGitHub, stdenv +, ffmpeg, frei0r, sox, gtk3, python3, ladspaPlugins +, gobject-introspection, makeWrapper, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "flowblade"; + version = "2.8.0.3"; + + src = fetchFromGitHub { + owner = "jliljebl"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/EkI3qiceB5eKTVQnpG+z4e6yaE9hDtn6I+iN/J+h/g="; + }; + + buildInputs = [ + ffmpeg frei0r sox gtk3 gobject-introspection ladspaPlugins + (python3.withPackages (ps: with ps; [ mlt pygobject3 dbus-python numpy pillow ])) + ]; + + nativeBuildInputs = [ gobject-introspection makeWrapper wrapGAppsHook ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -a ${src}/flowblade-trunk $out/flowblade + + makeWrapper $out/flowblade/flowblade $out/bin/flowblade \ + --set FREI0R_PATH ${frei0r}/lib/frei0r-1 \ + --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa \ + ''${gappsWrapperArgs[@]} + + runHook postInstall + ''; + + meta = with lib; { + description = "Multitrack Non-Linear Video Editor"; + homepage = "https://jliljebl.github.io/flowblade/"; + license = with licenses; [ gpl3Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ polygon ]; + }; +} diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 94bd0877a7d..d7ade6899dc 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { requests iso-639 iso3166 - websocket_client + websocket-client isodate ]) ++ [ rtmpdump diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index 233ee13ead8..cc893680674 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -3,7 +3,7 @@ , mock, pytest, nose , pyyaml, backports_ssl_match_hostname, colorama, docopt , dockerpty, docker, ipaddress, jsonschema, requests -, six, texttable, websocket_client, cached-property +, six, texttable, websocket-client, cached-property , enum34, functools32, paramiko, distro, python-dotenv }: @@ -22,7 +22,7 @@ buildPythonApplication rec { checkInputs = [ mock pytest nose ]; propagatedBuildInputs = [ pyyaml colorama dockerpty docker - ipaddress jsonschema requests six texttable websocket_client + ipaddress jsonschema requests six texttable websocket-client docopt cached-property paramiko distro python-dotenv ] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname ++ lib.optional (pythonOlder "3.4") enum34 diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index e9acf58713c..68cd70aab45 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.35.2"; + version = "1.36.0"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "sha256-Pg3vPvnEo1OkCakwkwS/HaFnvmpjuHHlGqIjddO6jwQ="; + sha256 = "sha256-4wSQ5R0haVnbtWk2im83A1FzrJDHVEFLqnkROGNF4q8="; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix index e9c646d32d0..2f7a804ad08 100644 --- a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix +++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "3.2.0"; + version = "5.0.0"; in fetchzip { name = "emacs-all-the-icons-fonts-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/all-the-icons ''; - sha256 = "0ps8q9nkx67ivgn8na4s012360v36jwr0951rsg7j6dyyw9g41jq"; + sha256 = "0vc9bkm4pcc05llcd2c9zr3d88h3zmci0izla5wnw8hg1n0rsrii"; meta = with lib; { description = "Icon fonts for emacs all-the-icons"; diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix index cca80708034..4f6f291f134 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-settings"; - version = "4.16.1"; + version = "4.16.2"; - sha256 = "0mjhglfsqmiycpv98l09n2556288g2713n4pvxn0srivm017fdir"; + sha256 = "09npyqxsbrvz60bkbardqrizd5rvray5hkp84qgjzc10z4qrnk0f"; postPatch = '' for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index b2a69a69278..4e9461dc743 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, lib }: let - version = "0.16.0"; + version = "0.17.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -17,7 +17,7 @@ in rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "0l09yhj3rsb9zj4cs6a1bcfmi6zbyb3xk1lv494xbyiv5d61vkwm"; + sha256 = "0szg9hx436cvy80sh94dzmf2rainnw3fjc84bv3hlzjwwzmxj9aw"; rev = version; }; releaseType = "escript"; diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index bcc1a07f679..f7dc6f8e87c 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -5,36 +5,13 @@ let let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; version = "2.2.1"; - dartVersion = "2.13.1"; channel = "stable"; filename = "flutter_linux_${version}-${channel}.tar.xz"; - dartStable = dart.override { - version = dartVersion; - sources = { - "${dartVersion}-x86_64-darwin" = fetchurl { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "0kb6r2rmp5d0shvgyy37fmykbgww8qaj4f8k79rmqfv5lwa3izya"; - }; - "${dartVersion}-x86_64-linux" = fetchurl { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "0zq8wngyrw01wjc5s6w1vz2jndms09ifiymjjixxby9k41mr6jrq"; - }; - "${dartVersion}-i686-linux" = fetchurl { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "0zv4q8xv2i08a6izpyhhnil75qhs40m5mgyvjqjsswqkwqdf7lkj"; - }; - "${dartVersion}-aarch64-linux" = fetchurl { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "0bb9jdmg5p608jmmiqibp13ydiw9avgysxlmljvgsl7wl93j6rgc"; - }; - }; - }; in { mkFlutter = mkFlutter; stable = mkFlutter rec { - dart = dartStable; - inherit version; + inherit dart version; pname = "flutter"; src = fetchurl { url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}"; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 21d1017a675..25b1c487357 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -95,12 +95,12 @@ in { nim-unwrapped = stdenv.mkDerivation rec { pname = "nim-unwrapped"; - version = "1.4.6"; + version = "1.4.8"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - hash = "sha256-D7wPkoLP/oXembxHv6h2Ulud3aKi6uVcGFoIgEuY070="; + hash = "sha256-t5jFd0EdfZW4YxJh27Nnbp0a/Z42dA0ESWagVVtBRBo="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ]; @@ -290,6 +290,8 @@ in { makeWrapper \ ${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \ + --set-default CC $(command -v $CC) \ + --set-default CXX $(command -v $CXX) \ $wrapperArgs ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index 685d58f1102..1d6abb59504 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -2,33 +2,32 @@ , lib , fetchurl , unzip -, version ? "2.12.2" -, sources ? - let +, version ? "2.13.1" +, sources ? let base = "https://storage.googleapis.com/dart-archive/channels"; x86_64 = "x64"; i686 = "ia32"; aarch64 = "arm64"; # Make sure that if the user overrides version parameter they're # also need to override sources, to avoid mistakes - version = "2.12.2"; + version = "2.13.1"; in { "${version}-x86_64-darwin" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "0h6mpy0kfc842vhg053fyxbjnd8lw1d1shdcsj800048260lxhyd"; + sha256 = "0kb6r2rmp5d0shvgyy37fmykbgww8qaj4f8k79rmqfv5lwa3izya"; }; "${version}-x86_64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "1gg210gf4yif3bl9k19znkndc4c1cd529xwxpi20ykaw3zfxxz2z"; + sha256 = "0zq8wngyrw01wjc5s6w1vz2jndms09ifiymjjixxby9k41mr6jrq"; }; "${version}-i686-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "1wngxba71j20gq9vy7n8q0m9rnqs047xm5b03bxk3hhaq6dyzkwn"; + sha256 = "0zv4q8xv2i08a6izpyhhnil75qhs40m5mgyvjqjsswqkwqdf7lkj"; }; "${version}-aarch64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "0rqsmzl5g5kgk54qb03kamjm5n5g5pqfl79np37xdzwqbv0zx22b"; + sha256 = "0bb9jdmg5p608jmmiqibp13ydiw9avgysxlmljvgsl7wl93j6rgc"; }; } }: @@ -40,9 +39,7 @@ stdenv.mkDerivation { pname = "dart"; inherit version; - nativeBuildInputs = [ - unzip - ]; + nativeBuildInputs = [ unzip ]; src = sources."${version}-${stdenv.hostPlatform.system}" or (throw "unsupported version/system: ${version}/${stdenv.hostPlatform.system}"); diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index abfa74bb67d..108da08b80d 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.kovirobi ]; platforms = with platforms; linux ++ darwin; inherit version; + mainProgram = "apl"; longDescription = '' GNU APL is a free interpreter for the programming language APL, with an diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix index 089fd11067b..2e0b587acfd 100644 --- a/pkgs/development/interpreters/micropython/default.nix +++ b/pkgs/development/interpreters/micropython/default.nix @@ -1,4 +1,12 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, libffi, python3, readline }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, pkg-config +, libffi +, python3 +, readline +}: stdenv.mkDerivation rec { pname = "micropython"; @@ -12,21 +20,50 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + # drop the following patches when upgrading to 1.16 + patches = [ + # fix build with modern clang https://github.com/micropython/micropython/pull/7254 + (fetchpatch { + url = "https://github.com/micropython/micropython/commit/126b1c727118352923703719a2a3d45b9fad3c97.patch"; + sha256 = "13a2bmz24syhd1qsqbx39dcjkjdhf05ln7lanh816m94lkfib21j"; + }) + # fix build with modern clang https://github.com/micropython/micropython/pull/7254 + (fetchpatch { + url = "https://github.com/micropython/micropython/commit/7ceccad4e2f1e9d073f5781c32e5b377e8391a25.patch"; + sha256 = "04mbxmb5yr6pbhhf9villq8km4wy579r46v9p4n0ysivrxij7i6f"; + }) + # fix build on aarch64-darwin https://github.com/micropython/micropython/pull/7393 + (fetchpatch { + url = "https://github.com/micropython/micropython/commit/95048129b1d93854c25f501c02801929aeeb23f0.patch"; + sha256 = "1cngcwq4jviyhdnfcrrkdadfikhffzbj0d634j0344cp247jb41n"; + }) + ]; + nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libffi readline ]; - doCheck = true; - buildPhase = '' + runHook preBuild make -C mpy-cross make -C ports/unix + runHook postBuild ''; + doCheck = true; + + skippedTests = "" + + lib.optionalString (stdenv.isDarwin) " -e uasyncio_basic -e uasyncio_wait_task" + + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) " -e ffi_callback" + + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) " -e float_parse" + ; + checkPhase = '' + runHook preCheck pushd tests - MICROPY_MICROPYTHON=../ports/unix/micropython ${python3.interpreter} ./run-tests.py + ${python3.interpreter} ./run-tests.py ${skippedTests} popd + runHook postCheck ''; installPhase = '' @@ -39,7 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A lean and efficient Python implementation for microcontrollers and constrained systems"; homepage = "https://micropython.org"; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; license = licenses.mit; maintainers = with maintainers; [ sgo ]; }; diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix index 4e8aa57d956..153892304e9 100644 --- a/pkgs/development/libraries/kyotocabinet/default.nix +++ b/pkgs/development/libraries/kyotocabinet/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "kyotocabinet-1.2.76"; + pname = "kyotocabinet"; + version = "1.2.79"; src = fetchurl { - url = "http://fallabs.com/kyotocabinet/pkg/${name}.tar.gz"; - sha256 = "0g6js20x7vnpq4p8ghbw3mh9wpqksya9vwhzdx6dnlf354zjsal1"; + url = "https://dbmx.net/kyotocabinet/pkg/kyotocabinet-${version}.tar.gz"; + sha256 = "079ymsahlrijswgwfr2la9yw5h57l752cprhp5dz31iamsj1vyv7"; }; prePatch = lib.optionalString stdenv.isDarwin '' @@ -24,18 +25,12 @@ stdenv.mkDerivation rec { --replace stdc++ c++ ''; - patches = [(fetchurl { - name = "gcc6.patch"; - url = "https://src.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch"; - sha256 = "1h5k38mkiq7lz8nd2gbn7yvimcz49g3z7phn1cr560bzjih8rz23"; - })]; - buildInputs = [ zlib ]; meta = with lib; { - homepage = "http://fallabs.com/kyotocabinet"; + homepage = "https://dbmx.net/kyotocabinet"; description = "A library of routines for managing a database"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 021dc1c3d95..8bd2bc80362 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -2,6 +2,8 @@ , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif , libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 , gtk2, genericUpdater, common-updater-scripts, libebur128 +, jack2, ladspa-sdk, swig, which, ncurses +, enablePython ? false, python }: stdenv.mkDerivation rec { @@ -16,18 +18,22 @@ stdenv.mkDerivation rec { }; buildInputs = [ - SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 - makeWrapper movit pkg-config sox libexif gtk2 fftw libebur128 - opencv4 SDL2 - ]; + SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev + movit sox libexif gtk2 fftw libebur128 opencv4 SDL2 jack2 + ladspa-sdk + ] ++ lib.optional enablePython ncurses; + + nativeBuildInputs = [ pkg-config makeWrapper which ] + ++ lib.optionals enablePython [ python swig ]; # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine configureFlags = [ "--avformat-swscale" "--enable-gpl" "--enable-gpl3" "--enable-opengl" - ]; + ] ++ lib.optional enablePython "--swig-languages=python"; enableParallelBuilding = true; + outPythonPath = lib.optionalString enablePython "$(toPythonPath $out)"; postInstall = '' wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 @@ -36,6 +42,11 @@ stdenv.mkDerivation rec { s=${movit.dev}/include t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g" + '' + lib.optionalString enablePython '' + mkdir -p ${outPythonPath}/mlt + cp -a src/swig/python/_mlt.so ${outPythonPath}/mlt/ + cp -a src/swig/python/mlt.py ${outPythonPath}/mlt/__init__.py + sed -i ${outPythonPath}/mlt/__init__.py -e "s|return importlib.import_module('_mlt')|return importlib.import_module('mlt._mlt')|g" ''; passthru.updateScript = genericUpdater { @@ -47,7 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open source multimedia framework, designed for television broadcasting"; homepage = "https://www.mltframework.org"; - license = licenses.gpl3; + license = with licenses; [ gpl3Only gpl2Only lgpl21Only ]; maintainers = with maintainers; [ tohl peti ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/retro-gtk/default.nix b/pkgs/development/libraries/retro-gtk/default.nix new file mode 100644 index 00000000000..3ab3ffcda0d --- /dev/null +++ b/pkgs/development/libraries/retro-gtk/default.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, fetchurl +, cmake +, meson +, ninja +, pkg-config +, epoxy +, glib +, gtk3 +, libpulseaudio +, libsamplerate +, gobject-introspection +, vala +, gtk-doc +}: + +stdenv.mkDerivation rec { + pname = "retro-gtk"; + version = "1.0.2"; + + src = fetchurl { + url = "mirror://gnome/sources/retro-gtk/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1lnb7dwcj3lrrvdzd85dxwrlid28xf4qdbrgfjyg1wn1z6sv063i"; + }; + + patches = [ + # https://gitlab.gnome.org/GNOME/retro-gtk/-/merge_requests/150 + ./gio-unix.patch + ]; + + nativeBuildInputs = [ + gobject-introspection + gtk-doc + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + epoxy + glib + gtk3 + libpulseaudio + libsamplerate + ]; + + meta = with lib; { + description = "The GTK Libretro frontend framework"; + longDescription = '' + Libretro is a plugin format design to implement video game + console emulators, video games and similar multimedia + software. Such plugins are called Libretro cores. + + RetroGTK is a framework easing the use of Libretro cores in + conjunction with GTK. + + It encourages the cores to be installed in a well defined + centralized place — namely the libretro subdirectory of your lib + directory — and it recommends them to come with Libretro core + descriptors. + ''; + homepage = "https://gitlab.gnome.org/GNOME/retro-gtk"; + changelog = "https://gitlab.gnome.org/GNOME/retro-gtk/-/blob/master/NEWS"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.DamienCassou ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/retro-gtk/gio-unix.patch b/pkgs/development/libraries/retro-gtk/gio-unix.patch new file mode 100644 index 00000000000..91f561c6504 --- /dev/null +++ b/pkgs/development/libraries/retro-gtk/gio-unix.patch @@ -0,0 +1,11 @@ +--- a/retro-gtk/meson.build 2021-03-21 20:25:51.000000000 +0100 ++++ b/retro-gtk/meson.build 2021-05-23 17:36:46.793693816 +0200 +@@ -103,6 +103,7 @@ + retro_gtk_deps = [ + epoxy, + gio, ++ gio_unix, + glib, + gmodule, + gobject, + diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix index b956967ee88..25c65d82632 100644 --- a/pkgs/development/libraries/sope/default.nix +++ b/pkgs/development/libraries/sope/default.nix @@ -4,13 +4,13 @@ with lib; gnustep.stdenv.mkDerivation rec { pname = "sope"; - version = "5.0.1"; + version = "5.1.1"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOPE-${version}"; - sha256 = "031m8ydr4jhh29332mfbsw0i5d0cjfqfyfs55jm832dlmv4447gb"; + sha256 = "0pap7c38kgadyp1a6qkmf9xhk69ybpmhfd4kc2n5nafhdbvks985"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/ocaml-modules/opam-file-format/default.nix b/pkgs/development/ocaml-modules/opam-file-format/default.nix index dd16a369881..d0ec77c4556 100644 --- a/pkgs/development/ocaml-modules/opam-file-format/default.nix +++ b/pkgs/development/ocaml-modules/opam-file-format/default.nix @@ -1,22 +1,22 @@ -{ lib, buildDunePackage, fetchFromGitHub }: +{ lib, fetchFromGitHub, buildDunePackage }: buildDunePackage rec { - version = "2.1.2"; pname = "opam-file-format"; - - useDune2 = true; + version = "2.1.3"; src = fetchFromGitHub { owner = "ocaml"; repo = pname; rev = version; - sha256 = "19xppn2s3yjid8jc1wh8gdf5mgmlpzby2cf2slmnbyrgln3vj6i2"; + sha256 = "1fxhppdmrysr2nb5z3c448h17np48f3ga9jih33acj78r4rdblcs"; }; - meta = { + useDune2 = true; + + meta = with lib; { description = "Parser and printer for the opam file syntax"; - license = lib.licenses.lgpl21; - maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + license = licenses.lgpl21; + maintainers = with maintainers; [ vbgl ]; + homepage = "https://github.com/ocaml/opam-file-format/"; }; } diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix index 2def7919fa1..b42ba55bfa7 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "aio-geojson-geonetnz-quakes"; - version = "0.12"; + version = "0.13"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-quakes"; rev = "v${version}"; - sha256 = "166gvcc1rzigb822k1373y18k54x5aklikr8sc7hyml5vz937xr7"; + sha256 = "sha256-M1QleYVPqLFjxBmOlNJdydxDTk0JJf+GYVtOTC3YUTA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index e6cc3182487..86fa3bafa2a 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -8,6 +8,8 @@ , typing-extensions , curio , hypothesis +, mock +, pytest-mock , pytestCheckHook , trio , trustme @@ -16,7 +18,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "2.2.0"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +26,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "0ram1niv2lg9qj53zssph104a4kxl8f94ilfn6mibn034m3ikcc8"; + sha256 = "sha256-zQiSAQN7cp1s+8hDTvYaMkHUXV1ccNwIsl2IOztH7J8="; }; propagatedBuildInputs = [ @@ -37,18 +39,21 @@ buildPythonPackage rec { checkInputs = [ curio hypothesis + pytest-mock pytestCheckHook trio trustme uvloop + ] ++ lib.optionals (pythonOlder "3.8") [ + mock ]; - pytestFlagsArray = [ - # lots of DNS lookups - "--ignore=tests/test_sockets.py" + disabledTestPaths = [ + # lots of DNS lookups + "tests/test_sockets.py" ] ++ lib.optionals stdenv.isDarwin [ # darwin sandboxing limitations - "--ignore=tests/streams/test_tls.py" + "tests/streams/test_tls.py" ]; pythonImportsCheck = [ "anyio" ]; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 2bb950beb28..9ea4fdf64b5 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder , aria2, poetry, pytest, pytestcov, pytest_xdist, responses -, asciimatics, loguru, requests, setuptools, websocket_client +, asciimatics, loguru, requests, setuptools, websocket-client }: buildPythonPackage rec { @@ -32,7 +32,7 @@ buildPythonPackage rec { pytest -nauto -k "not test_api and not test_cli and not test_interface" ''; - propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket_client ]; + propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket-client ]; meta = with lib; { homepage = "https://github.com/pawamoy/aria2p"; diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix new file mode 100644 index 00000000000..21b711c8ab0 --- /dev/null +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-core +, uamqp +}: + +buildPythonPackage rec { + pname = "azure-eventhub"; + version = "5.5.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "7b757b4910ac74902564b38089b9861c1bc51ff15bd49ff056888f939f7c4c49"; + }; + + propagatedBuildInputs = [ + azure-core + uamqp + ]; + + # too complicated to set up + doCheck = false; + + pythonImportsCheck = [ + "azure.eventhub" + "azure.eventhub.aio" + ]; + + meta = with lib; { + description = "Microsoft Azure Event Hubs Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/eventhub/azure-eventhub"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/backports-zoneinfo/default.nix b/pkgs/development/python-modules/backports-zoneinfo/default.nix index a9bc0b55955..0b4703e2651 100644 --- a/pkgs/development/python-modules/backports-zoneinfo/default.nix +++ b/pkgs/development/python-modules/backports-zoneinfo/default.nix @@ -1,6 +1,9 @@ { lib, buildPythonPackage, fetchFromGitHub , pythonOlder +, python +, substituteAll , importlib-resources +, tzdata , hypothesis , pytestCheckHook }: @@ -16,7 +19,17 @@ buildPythonPackage rec { sha256 = "sha256-00xdDOVdDanfsjQTd3yjMN2RFGel4cWRrAA3CvSnl24="; }; - propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ + patches = [ + (substituteAll { + name = "zoneinfo-path"; + src = ./zoneinfo.patch; + zoneinfo = "${tzdata}/lib/${python.libPrefix}/site-packages/tzdata/zoneinfo"; + }) + ]; + + propagatedBuildInputs = [ + tzdata + ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ]; @@ -27,8 +40,14 @@ buildPythonPackage rec { pytestCheckHook ]; - # unfortunately /etc/zoneinfo doesn't exist in sandbox, and many tests fail - doCheck = false; + disabledTests = [ + # AssertionError: 'AEDT' != 'AEST' + "test_folds_and_gaps" + # AssertionError: 0 != 1 : (datetime.datetime(1917, 3, 25, 2, 0, 1, tzinfo=backports.zoneinfo.ZoneInfo(key='Australia/Sydney')), datetime.datetime(1917, 3, 24, 15, 0, tzinfo=datetime.timezone.utc)) + "test_folds_from_utc" + # backports.zoneinfo._common.ZoneInfoNotFoundError: 'No time zone found with key Eurasia/Badzone' + "test_bad_keys" + ]; meta = with lib; { description = "Backport of the standard library module zoneinfo"; diff --git a/pkgs/development/python-modules/backports-zoneinfo/zoneinfo.patch b/pkgs/development/python-modules/backports-zoneinfo/zoneinfo.patch new file mode 100644 index 00000000000..69dd75030ab --- /dev/null +++ b/pkgs/development/python-modules/backports-zoneinfo/zoneinfo.patch @@ -0,0 +1,17 @@ +diff --git a/src/backports/zoneinfo/_tzpath.py b/src/backports/zoneinfo/_tzpath.py +index 9baaf6b..3f842af 100644 +--- a/src/backports/zoneinfo/_tzpath.py ++++ b/src/backports/zoneinfo/_tzpath.py +@@ -24,10 +24,7 @@ def reset_tzpath(to=None): + base_tzpath = _parse_python_tzpath(env_var) + elif sys.platform != "win32": + base_tzpath = [ +- "/usr/share/zoneinfo", +- "/usr/lib/zoneinfo", +- "/usr/share/lib/zoneinfo", +- "/etc/zoneinfo", ++ "@zoneinfo@" + ] + + base_tzpath.sort(key=lambda x: not os.path.exists(x)) + diff --git a/pkgs/development/python-modules/blebox-uniapi/default.nix b/pkgs/development/python-modules/blebox-uniapi/default.nix new file mode 100644 index 00000000000..c3dbe3ccd32 --- /dev/null +++ b/pkgs/development/python-modules/blebox-uniapi/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, semver +, asynctest +, deepmerge +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "blebox-uniapi"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "blebox"; + repo = "blebox_uniapi"; + rev = "v${version}"; + sha256 = "0qvv2697yhqjmgvh37h8wgz3a77n61kqmxvsk4pf47wn43hks15c"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + + propagatedBuildInputs = [ + aiohttp + semver + ]; + + checkInputs = [ + asynctest + deepmerge + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "blebox_uniapi" ]; + + meta = with lib; { + description = "Python API for accessing BleBox smart home devices"; + homepage = "https://github.com/blebox/blebox_uniapi"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/bond-api/default.nix b/pkgs/development/python-modules/bond-api/default.nix new file mode 100644 index 00000000000..39a6cc44333 --- /dev/null +++ b/pkgs/development/python-modules/bond-api/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, aioresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "bond-api"; + version = "0.1.12"; + + src = fetchFromGitHub { + owner = "prystupa"; + repo = "bond-api"; + rev = "v${version}"; + sha256 = "0zqaqqadr4x4vmq28nfk5x67gfwqqfy19z0cgrpxlbbvxamccym0"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "bond_api" ]; + + meta = with lib; { + description = "Asynchronous Python wrapper library over Bond Local API"; + homepage = "https://github.com/prystupa/bond-api"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix new file mode 100644 index 00000000000..f644c8c9c20 --- /dev/null +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchPypi, buildPythonPackage, isPy3k, boost, numpy, pytestCheckHook, pytest-benchmark }: + +buildPythonPackage rec { + pname = "boost-histogram"; + version = "1.0.2"; + disabled = !isPy3k; + + src = fetchPypi { + pname = "boost_histogram"; + inherit version; + sha256 = "b79cb9a00c5b8e44ff24ffcbec0ce5d3048dd1570c8592066344b6d2f2369fa2"; + }; + + buildInputs = [ boost ]; + propagatedBuildInputs = [ numpy ]; + + checkInputs = [ pytestCheckHook pytest-benchmark ]; + + meta = with lib; { + description = "Python bindings for the C++14 Boost::Histogram library"; + homepage = "https://github.com/scikit-hep/boost-histogram"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix index 90e34288154..44a0165d6fd 100644 --- a/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -6,7 +6,7 @@ , pytestCheckHook , pythonOlder , requests -, websocket_client +, websocket-client , zeroconf }: @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests zeroconf - websocket_client + websocket-client ]; checkInputs = [ diff --git a/pkgs/development/python-modules/docker-py/default.nix b/pkgs/development/python-modules/docker-py/default.nix index f7982c4a119..2d88f64d36a 100644 --- a/pkgs/development/python-modules/docker-py/default.nix +++ b/pkgs/development/python-modules/docker-py/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, six, requests, websocket_client, docker_pycreds }: +{ lib, buildPythonPackage, fetchPypi, six, requests, websocket-client, docker_pycreds }: buildPythonPackage rec { version = "1.10.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six requests - websocket_client + websocket-client docker_pycreds ]; diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index ab7a7b664b0..5e5071e9308 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -9,7 +9,7 @@ , pytestCheckHook , requests , six -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { paramiko requests six - websocket_client + websocket-client ] ++ lib.optional isPy27 backports_ssl_match_hostname; checkInputs = [ diff --git a/pkgs/development/python-modules/foobot-async/default.nix b/pkgs/development/python-modules/foobot-async/default.nix new file mode 100644 index 00000000000..cd5be4ab0c2 --- /dev/null +++ b/pkgs/development/python-modules/foobot-async/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, aiohttp +, async-timeout +, aioresponses +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "foobot-async"; + version = "1.0.0"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + pname = "foobot_async"; + inherit version; + sha256 = "fa557a22de925139cb4a21034ffdbcd01d28bf166c0e680eaf84a99206327f40"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + checkInputs = [ + aioresponses + pytestCheckHook + ]; + + pythonImportsCheck = [ "foobot_async" ]; + + meta = with lib; { + description = "API Client for Foobot Air Quality Monitoring devices"; + homepage = "https://github.com/reefab/foobot_async"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 1965e0d3ade..9a2f89e8c41 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -17,7 +17,7 @@ , requests , requests_toolbelt , terminaltables -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -55,7 +55,7 @@ buildPythonPackage rec { requests requests_toolbelt terminaltables - websocket_client + websocket-client ]; # tries to use /homeless-shelter to mimic container usage, etc diff --git a/pkgs/development/python-modules/graphql-subscription-manager/default.nix b/pkgs/development/python-modules/graphql-subscription-manager/default.nix new file mode 100644 index 00000000000..1a3c32e04d4 --- /dev/null +++ b/pkgs/development/python-modules/graphql-subscription-manager/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, websockets +}: + +buildPythonPackage rec { + pname = "graphql-subscription-manager"; + version = "0.4.0"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "PyGraphqlWebsocketManager"; + rev = version; + sha256 = "1176xzr9fa7gl5cm0pcv5lb45d2ms5awi601rjcr3a0a14a1i8fz"; + }; + + propagatedBuildInputs = [ + setuptools + websockets + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "graphql_subscription_manager" ]; + + meta = with lib; { + description = "Python3 library for graphql subscription manager"; + homepage = "https://github.com/Danielhiversen/PyGraphqlWebsocketManager"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix new file mode 100644 index 00000000000..5b2e86b5fb5 --- /dev/null +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, netifaces +, pycryptodome +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "greeclimate"; + version = "0.11.8"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "cmroche"; + repo = "greeclimate"; + rev = version; + sha256 = "1n46klbhl0gpd5x995mrcr1qfd77hrfm501qns1zhvv0zk8mdsf4"; + }; + + propagatedBuildInputs = [ + netifaces + pycryptodome + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "greeclimate" + "greeclimate.device" + "greeclimate.discovery" + "greeclimate.exceptions" + "greeclimate.network" + ]; + + meta = with lib; { + description = "Discover, connect and control Gree based minisplit systems"; + homepage = "https://github.com/cmroche/greeclimate"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index b2d6da18fe7..c8cc21278b6 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -10,7 +10,7 @@ , pytest-aiohttp , pytest-asyncio , requests -, websocket_client +, websocket-client , websockets }: @@ -31,7 +31,7 @@ buildPythonPackage rec { aiohttp async-timeout requests - websocket_client + websocket-client websockets ]; diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 079b5e71a10..64e2b114452 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -2,31 +2,33 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, anyio , h11 , h2 , pproxy , pytest-asyncio -, pytest-trio , pytestCheckHook , pytestcov , sniffio +, trio , trustme , uvicorn }: buildPythonPackage rec { pname = "httpcore"; - version = "0.13.0"; + version = "0.13.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-KvqBVQUaF3p2oJz0tt3Bkn2JiKEHqrZ3b6I9f0JK5h8="; + sha256 = "0vfdkd3bq14mnjd2gfg3ajsgygmd796md7pv96nicpx20prw3a2p"; }; propagatedBuildInputs = [ + anyio h11 h2 sniffio @@ -35,16 +37,23 @@ buildPythonPackage rec { checkInputs = [ pproxy pytest-asyncio - pytest-trio pytestCheckHook pytestcov + trio trustme uvicorn ]; + postPatch = '' + # The anyio 3.1.0 release is not picked-up proberly + substituteInPlace setup.py --replace "anyio==3.*" "anyio" + ''; + + disabledTestPaths = [ # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known "tests/test_threadsafety.py" + "tests/async_tests/" "tests/sync_tests/test_interfaces.py" "tests/sync_tests/test_retries.py" ]; diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index fe8756fde03..1c59878b478 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -8,7 +8,7 @@ , tox , requests , python-dateutil -, websocket_client +, websocket-client , ibm-cloud-sdk-core }: @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests python-dateutil - websocket_client + websocket-client ibm-cloud-sdk-core ]; diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix index 84ea65a7477..2dc34b883be 100644 --- a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix +++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, requests -, websocket_client, pythonOlder }: +, websocket-client, pythonOlder }: buildPythonPackage rec { pname = "jellyfin-apiclient-python"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "sha256-nSLUa9/jAT6XrHo77kV5HYBxPO/lhcWKqPfpES7ul9A="; }; - propagatedBuildInputs = [ requests websocket_client ]; + propagatedBuildInputs = [ requests websocket-client ]; doCheck = false; # no tests pythonImportsCheck = [ "jellyfin_apiclient_python" ]; diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index f2cb598a6c9..952527d5cab 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonAtLeast, - ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal, + ipaddress, websocket-client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal, isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }: buildPythonPackage rec { @@ -28,7 +28,7 @@ buildPythonPackage rec { }; checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; - propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ]; + propagatedBuildInputs = [ ipaddress websocket-client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ]; meta = with lib; { description = "Kubernetes python client"; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index a900c61d40b..a70923de2be 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -1,6 +1,6 @@ { lib, fetchPypi, buildPythonPackage, hidapi , pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket_client + hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket-client ]; # No tests diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index 77dcdcaef02..edee7a62536 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , enum-compat , requests -, websocket_client +, websocket-client , zeroconf , pytestCheckHook }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests enum-compat - websocket_client + websocket-client zeroconf ]; diff --git a/pkgs/development/python-modules/orvibo/default.nix b/pkgs/development/python-modules/orvibo/default.nix index 6209baa144b..17a3a769111 100644 --- a/pkgs/development/python-modules/orvibo/default.nix +++ b/pkgs/development/python-modules/orvibo/default.nix @@ -6,7 +6,7 @@ , pytest-runner , pytestCheckHook , requests -, websocket_client +, websocket-client }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index dc832809c28..5c41c3308be 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , requests , tqdm -, websocket_client +, websocket-client , isPy27 }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests tqdm - websocket_client + websocket-client ]; # Tests require a running Plex instance diff --git a/pkgs/development/python-modules/praw/6.3.nix b/pkgs/development/python-modules/praw/6.3.nix index 3fc485c00ec..242300949ec 100644 --- a/pkgs/development/python-modules/praw/6.3.nix +++ b/pkgs/development/python-modules/praw/6.3.nix @@ -9,7 +9,7 @@ , pytest , requests-toolbelt , update_checker -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { mock prawcore update_checker - websocket_client + websocket-client ]; checkInputs = [ diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 5047c1e88b0..5ae4d0b280f 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -9,7 +9,7 @@ , pytestCheckHook , requests-toolbelt , update_checker -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { mock prawcore update_checker - websocket_client + websocket-client ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet/default.nix index 43cab7db675..92338d92531 100644 --- a/pkgs/development/python-modules/pushbullet/default.nix +++ b/pkgs/development/python-modules/pushbullet/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , requests -, websocket_client +, websocket-client , python_magic , cryptography , pytestCheckHook @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64"; }; - propagatedBuildInputs = [ cryptography requests websocket_client python_magic ]; + propagatedBuildInputs = [ cryptography requests websocket-client python_magic ]; preCheck = '' export PUSHBULLET_API_KEY="" diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 3a375b8d284..989433b499d 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -57,8 +57,8 @@ buildPythonPackage rec { meta = with lib; { description = "A cross-language development platform for in-memory data"; homepage = "https://arrow.apache.org/"; - license = lib.licenses.asl20; + license = licenses.asl20; platforms = platforms.unix; - maintainers = with lib.maintainers; [ veprbl ]; + maintainers = with maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/python-modules/pyfireservicerota/default.nix b/pkgs/development/python-modules/pyfireservicerota/default.nix new file mode 100644 index 00000000000..9d917a48016 --- /dev/null +++ b/pkgs/development/python-modules/pyfireservicerota/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytz +, oauthlib +, requests +, websocket-client +}: + +buildPythonPackage rec { + pname = "pyfireservicerota"; + version = "0.0.40"; + + src = fetchPypi { + inherit pname version; + sha256 = "8d8173f6682ef2a61367660a15559c8c7a7e00db3f98092e0fa52e771df356f4"; + }; + + propagatedBuildInputs = [ + pytz + oauthlib + requests + websocket-client + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "pyfireservicerota" ]; + + meta = with lib; { + description = "Python 3 API wrapper for FireServiceRota/BrandweerRooster"; + homepage = "https://github.com/cyberjunky/python-fireservicerota"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyflick/default.nix b/pkgs/development/python-modules/pyflick/default.nix new file mode 100644 index 00000000000..b1f39353c14 --- /dev/null +++ b/pkgs/development/python-modules/pyflick/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, aiohttp +, dateutil +}: + +buildPythonPackage rec { + pname = "pyflick"; + version = "0.0.2"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "PyFlick"; + inherit version; + sha256 = "705c82d8caedfff19117c8859cc1b4f56e15ab8dbc0d64d63b79d8634007897f"; + }; + + propagatedBuildInputs = [ + aiohttp + dateutil + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ + "pyflick" + "pyflick.authentication" + ]; + + meta = with lib; { + description = "Python API For Flick Electric in New Zealand"; + homepage = "https://github.com/ZephireNZ/PyFlick"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index d02c85fb4ff..9d0bef8e19d 100644 --- a/pkgs/development/python-modules/pysc2/default.nix +++ b/pkgs/development/python-modules/pysc2/default.nix @@ -12,7 +12,7 @@ , pygame , s2clientprotocol , six -, websocket_client +, websocket-client , sc2-headless }: @@ -49,7 +49,7 @@ buildPythonPackage { pygame s2clientprotocol six - websocket_client + websocket-client sc2-headless ]; diff --git a/pkgs/development/python-modules/python-engineio/3.nix b/pkgs/development/python-modules/python-engineio/3.nix index 5deeec0bb57..f113f47802b 100644 --- a/pkgs/development/python-modules/python-engineio/3.nix +++ b/pkgs/development/python-modules/python-engineio/3.nix @@ -10,7 +10,7 @@ , requests , six , tornado -, websocket_client +, websocket-client , websockets , pytestCheckHook , pythonAtLeast @@ -37,7 +37,7 @@ buildPythonPackage rec { mock requests tornado - websocket_client + websocket-client websockets pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index ed03d966307..486484bca3a 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -9,7 +9,7 @@ , requests , six , tornado -, websocket_client +, websocket-client , websockets , pytestCheckHook }: @@ -31,7 +31,7 @@ buildPythonPackage rec { mock requests tornado - websocket_client + websocket-client websockets pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix index 82ee7e20924..8c43d7a4ca2 100644 --- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix +++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, requests -, tqdm, websocket_client, pythonOlder }: +, tqdm, websocket-client, pythonOlder }: buildPythonPackage rec { pname = "python-mpv-jsonipc"; @@ -16,7 +16,7 @@ buildPythonPackage rec { # 'mpv-jsonipc' does not have any tests doCheck = false; - propagatedBuildInputs = [ requests tqdm websocket_client ]; + propagatedBuildInputs = [ requests tqdm websocket-client ]; pythonImportsCheck = [ "python_mpv_jsonipc" ]; diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix new file mode 100644 index 00000000000..a8814b1e783 --- /dev/null +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, async-timeout +, graphql-subscription-manager +, python-dateutil +, pytz +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytibber"; + version = "0.17.1"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "pyTibber"; + rev = version; + sha256 = "1zda9cvg6hy0n7sr2z71lkyl93n1gnzxrvf56lhz13pcsffshhdk"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + graphql-subscription-manager + python-dateutil + pytz + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "test/test.py" ]; + + # tests access network + doCheck = false; + + pythonImportsCheck = [ "tibber" ]; + + meta = with lib; { + description = "A python3 library to communicate with Tibber"; + homepage = "https://github.com/Danielhiversen/pyTibber"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix index dc31ea4a038..677483e8823 100644 --- a/pkgs/development/python-modules/roonapi/default.nix +++ b/pkgs/development/python-modules/roonapi/default.nix @@ -7,7 +7,7 @@ , pythonOlder , requests , six -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { ifaddr requests six - websocket_client + websocket-client ]; patches = [ diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index 9244a94d235..c47054632c6 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -21,7 +21,7 @@ , deepdiff , pytestCheckHook , pytestcov -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -62,7 +62,7 @@ buildPythonPackage rec { deepdiff pytestCheckHook pytestcov - websocket_client + websocket-client ]; disabledTests = [ diff --git a/pkgs/development/python-modules/samsungctl/default.nix b/pkgs/development/python-modules/samsungctl/default.nix index d29e89db846..174af902351 100644 --- a/pkgs/development/python-modules/samsungctl/default.nix +++ b/pkgs/development/python-modules/samsungctl/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - websocket_client + websocket-client ]; # no tests diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index 3a12568c4d6..31fa56a3472 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , requests -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - websocket_client + websocket-client requests ]; diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index d04fd24f2e9..1d884959831 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -15,7 +15,7 @@ , pytestCheckHook , pytestrunner , sqlalchemy -, websocket_client +, websocket-client , websockets }: @@ -36,7 +36,7 @@ buildPythonPackage rec { aiohttp boto3 sqlalchemy - websocket_client + websocket-client websockets ]; diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index cf7b161261e..e96161228a5 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -14,7 +14,7 @@ , requests , responses , six -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - websocket_client + websocket-client requests six ]; diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 125850a080f..a762ec55ee3 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -48,6 +48,9 @@ buildPythonPackage rec { # test gets stuck in epoll_pwait on hydras aarch64 builders # https://github.com/MagicStack/uvloop/issues/412 "--deselect" "tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # Flaky test: https://github.com/MagicStack/uvloop/issues/412 + "--deselect" "tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/wallbox/default.nix b/pkgs/development/python-modules/wallbox/default.nix new file mode 100644 index 00000000000..c892ea3f88c --- /dev/null +++ b/pkgs/development/python-modules/wallbox/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, requests +, simplejson +}: + +buildPythonPackage rec { + pname = "wallbox"; + version = "0.4.5"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "cf1616d79cb0345849ceff1b89a7c80e26ae19b3c2d818def62d6975665838c1"; + }; + + propagatedBuildInputs = [ + requests + simplejson + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "wallbox" ]; + + meta = with lib; { + description = "Module for interacting with Wallbox EV charger api"; + homepage = "https://github.com/cliviu74/wallbox"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix index a07c1e6333e..526066f1fa7 100644 --- a/pkgs/development/python-modules/waterfurnace/default.nix +++ b/pkgs/development/python-modules/waterfurnace/default.nix @@ -6,7 +6,7 @@ , pytest-runner , pytestCheckHook , requests -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { click pytest-runner requests - websocket_client + websocket-client ]; checkInputs = [ diff --git a/pkgs/development/python-modules/websocket_client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index 6ad0634631d..b6b2c7ee036 100644 --- a/pkgs/development/python-modules/websocket_client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -8,11 +8,12 @@ }: buildPythonPackage rec { - pname = "websocket_client"; + pname = "websocket-client"; version = "0.58.0"; src = fetchPypi { - inherit pname version; + pname = "websocket_client"; + inherit version; sha256 = "sha256-Y1CbQdFYrlt/Z+tK0g/su07umUNOc+FANU3D/44JcW8="; }; diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 973393a8932..6f06c8dba90 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.5.0"; + version = "0.6.0"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "123806fmdihdf9y8dqp5rli5c4i9a74j9rmhay8m68igm1326d5f"; + sha256 = "sha256-aFBcSGPCT49TbqzjUv/d8agdPOCC090rNxDnE9y91Pk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index e7b0c1d105b..a94ca34d036 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "3.0.9"; + version = "3.0.12"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "xac8PYo3qYjtQbDy8piOz5BQQpcVlAvMCv1qHrVZmPQ="; + sha256 = "0nalvmkl9iwbs4wbsacryrwr46vk3x6jzqj9v5wfyf6aim3s1szs"; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rizsotto/Bear"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ maintainers.babariviere ]; + maintainers = with maintainers; [ babariviere qyliss ]; # ld: symbol(s) not found for architecture x86_64 broken = stdenv.isDarwin; }; diff --git a/pkgs/development/tools/build-managers/bear/no-double-relative.patch b/pkgs/development/tools/build-managers/bear/no-double-relative.patch index f4d247fa576..257c7ffea38 100644 --- a/pkgs/development/tools/build-managers/bear/no-double-relative.patch +++ b/pkgs/development/tools/build-managers/bear/no-double-relative.patch @@ -1,14 +1,22 @@ -diff --git a/source/config.h.in b/source/config.h.in -index 728c234..a3e76c6 100644 ---- a/source/config.h.in -+++ b/source/config.h.in -@@ -65,6 +65,6 @@ constexpr char VERSION[] = "@CMAKE_PROJECT_VERSION@"; - - constexpr char CITNAMES_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/citnames"; - constexpr char INTERCEPT_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/intercept"; --constexpr char LIBRARY_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; --constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper"; --constexpr char WRAPPER_DIR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; -+constexpr char LIBRARY_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; -+constexpr char WRAPPER_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper"; -+constexpr char WRAPPER_DIR_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; +diff --git i/source/config.h.in w/source/config.h.in +index ffcce3a..0caba6d 100644 +--- i/source/config.h.in ++++ w/source/config.h.in +@@ -107,7 +107,7 @@ namespace cmd { + } + + namespace wrapper { +- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper"; ++ constexpr char DEFAULT_PATH[] = "@PRIVATE_INSTALLDIR@/wrapper"; + constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper.d"; + + constexpr char FLAG_VERBOSE[] = "--verbose"; +@@ -120,7 +120,7 @@ namespace cmd { + } + + namespace library { +- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; ++ constexpr char DEFAULT_PATH[] = "@PRIVATE_INSTALLDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; + + constexpr char KEY_REPORTER[] = "INTERCEPT_REPORT_COMMAND"; + constexpr char KEY_DESTINATION[] = "INTERCEPT_REPORT_DESTINATION"; diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index dfa65736f99..7fa8feb8e33 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, nix-update-source, lib, python3 , which, runtimeShell, pychecker ? null }: stdenv.mkDerivation rec { - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "timbertson"; repo = "gup"; - rev = "version-0.7.0"; - sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv"; + rev = "version-${version}"; + sha256 = "1zjd76jyb5zc9w3l368723bjmxjl05s096g8ipwncfks1p9hdgf3"; }; pname = "gup"; nativeBuildInputs = [ python3 which pychecker ]; @@ -18,20 +18,23 @@ stdenv.mkDerivation rec { mkdir $out cp -r python/bin $out/bin ''; - passthru.updateScript = '' - #!${runtimeShell} - set -e - echo - cd ${toString ./.} - ${nix-update-source}/bin/nix-update-source \ - --prompt version \ - --replace-attr version \ - --set owner timbertson \ - --set repo gup \ - --set type fetchFromGitHub \ - --set rev 'version-{version}' \ - --modify-nix default.nix - ''; + passthru.updateScript = [ + runtimeShell + "-c" + '' + set -e + echo + cd ${toString ./.} + ${nix-update-source}/bin/nix-update-source \ + --prompt version \ + --replace-attr version \ + --set owner timbertson \ + --set repo gup \ + --set type fetchFromGitHub \ + --set rev 'version-{version}' \ + --modify-nix default.nix + '' + ]; meta = { inherit (src.meta) homepage; description = "A better make, inspired by djb's redo"; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 89628b81fbc..677b31063ac 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "10kIQNy+3V1SD4uEZs/BJ4E6bTCRV3wjBN8gw9jr9VQ="; + sha256 = "035jl4czx9ixl12z874bksq5wxdnajxr06cl1yvfj2v92yx3l5wf"; }; postPatch = '' diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix index f8b2a27dfc4..f417dc42035 100644 --- a/pkgs/development/tools/butane/default.nix +++ b/pkgs/development/tools/butane/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "butane"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "coreos"; repo = "butane"; rev = "v${version}"; - sha256 = "0wjnzxjv71pmn88f6fm20xhsmdib6jwn9839n1xw9px9w95qg0yy"; + sha256 = "1bgh7h3hwrgjkw72233qzqpkshzbizhdapa0lalzj1xnclq3rqlp"; }; vendorSha256 = null; diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index 2a7a7b1a16a..192a33ad7ca 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/pkgs/development/tools/irony-server/default.nix @@ -1,20 +1,16 @@ -{ lib, stdenv, cmake, llvmPackages, irony }: +{ lib, stdenv, cmake, llvmPackages, llvm, irony }: stdenv.mkDerivation { pname = "irony-server"; inherit (irony) src version; - nativeBuildInputs = [ cmake llvmPackages.llvm.dev ]; - buildInputs = [ llvmPackages.libclang llvmPackages.llvm ]; + nativeBuildInputs = [ cmake llvm ]; + buildInputs = [ llvmPackages.libclang ]; dontUseCmakeBuildDir = true; cmakeDir = "server"; - cmakeFlags = [ - "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}" - ]; - meta = with lib; { description = "The server part of irony"; homepage = "https://melpa.org/#/irony"; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index dbd10772a62..e1ae8a5a0e7 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "casey"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-C0W5oMnKlQ5hg/0YLKZKiQfLghJ7yAJYW6k0G6eOFQE="; + rev = version; + sha256 = "sha256-fDbnOfT2BTCLF2knUf3ccDnuA0mhM+gkbja7xgmWoaY="; }; - cargoSha256 = "sha256-TqvUunBFpKIog0pG85M/JLz8orncgbRqnQolseXYSo4="; + cargoSha256 = "sha256-mBrFw5d0LXTKj7Nm8XmT5hsq/d/x84U/Gp02+lay2OY="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/mpfshell/default.nix b/pkgs/development/tools/mpfshell/default.nix index efe2b397f95..e8a2a9b8921 100644 --- a/pkgs/development/tools/mpfshell/default.nix +++ b/pkgs/development/tools/mpfshell/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { }; propagatedBuildInputs = with python3Packages; [ - pyserial colorama websocket_client + pyserial colorama websocket-client ]; doCheck = false; diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 56c57483ddc..b26449ba7c7 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "0gjm9pvwfbwhd49pm5sw5plwhlhvbfkms44h67zgvy7xzqv8h3dw"; + sha256 = "0ihb6hq1va6nj7d2883m9gdhzrwmcsw7z0fxqkhs9scv4i9x6s9d"; }; - cargoSha256 = "117m78naldp6yvwcccvsrbnx6x6287cvq0saa06pmiqv1rqm50m3"; + cargoSha256 = "04gm9drb4qh1sdzqqdj3lwb462y22sz24gjr6nw3sd2a0iqhsknf"; cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ] ++ lib.optionals luauSupport [ "--features" "luau" ]; diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix index d360500e1fb..6d1622c5b86 100644 --- a/pkgs/development/tools/wiggle/default.nix +++ b/pkgs/development/tools/wiggle/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, ncurses, groff }: +{ lib, stdenv, fetchFromGitHub, ncurses, groff }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { + name = "wiggle"; + version = "1.3"; - name = "wiggle-1.3"; - - src = fetchurl { - url = "https://github.com/neilbrown/wiggle/archive/v1.3.tar.gz"; - sha256 = "sha256-/5LPATPB9NzjNWPiY8sw59229KvfhtQnsewUkL7CWvo="; + src = fetchFromGitHub { + owner = "neilbrown"; + repo = "wiggle"; + rev = "v${version}"; + sha256 = "sha256-rlHhYzP81lfblZvtZ1lhiq4iQ6WRpBYukoGqpVP+NKI="; }; buildInputs = [ ncurses groff ]; @@ -21,24 +23,22 @@ stdenv.mkDerivation { patchShebangs . ''; - meta = { - homepage = "http://blog.neil.brown.name/category/wiggle/"; + meta = with lib; { + homepage = "https://blog.neil.brown.name/category/wiggle/"; description = "Tool for applying patches with conflicts"; - longDescription = '' - Wiggle applies patches to a file in a similar manner to the patch(1) - program. The distinctive difference is, however, that wiggle will - attempt to apply a patch even if the "before" part of the patch doesn't - match the target file perfectly. This is achieved by breaking the file - and patch into words and finding the best alignment of words in the file - with words in the patch. Once this alignment has been found, any - differences (word-wise) in the patch are applied to the file as best as - possible. Also, wiggle will (in some cases) detect changes that have - already been applied, and will ignore them. + Wiggle applies patches to a file in a similar manner to the patch(1) + program. The distinctive difference is, however, that wiggle will + attempt to apply a patch even if the "before" part of the patch doesn't + match the target file perfectly. This is achieved by breaking the file + and patch into words and finding the best alignment of words in the file + with words in the patch. Once this alignment has been found, any + differences (word-wise) in the patch are applied to the file as best as + possible. Also, wiggle will (in some cases) detect changes that have + already been applied, and will ignore them. ''; - - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.all; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ ]; }; - } diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 7054e4c66b8..27b2a4f3319 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -1,14 +1,13 @@ -{ callPackage, icu68, python3, lib, stdenv, enableNpm ? true }: +{ callPackage, python3, lib, stdenv, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { - icu = icu68; python = python3; }; in buildNodejs { inherit enableNpm; - version = "14.17.0"; - sha256 = "1vf989canwcx0wdpngvkbz2x232yccp7fzs1vcbr60rijgzmpq2n"; + version = "14.17.1"; + sha256 = "0zr4b9gja8f9611rnmc9yacmh90bd76xv9ayikcyqdfzdpax5wfx"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix new file mode 100644 index 00000000000..0542b2ab303 --- /dev/null +++ b/pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchurl +, dpkg +, makeWrapper +, coreutils +, gnugrep +, gnused +, mfc9140cdnlpr +, pkgsi686Linux +, psutils +}: + +stdenv.mkDerivation rec { + pname = "mfc9140cdncupswrapper"; + version = "1.1.4-0"; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf100407/${pname}-${version}.i386.deb"; + sha256 = "18aramgqgra1shdhsa75i0090hk9i267gvabildwsk52kq2b96c6"; + }; + + unpackPhase = '' + dpkg-deb -x $src $out + ''; + + nativeBuildInputs = [ + dpkg + makeWrapper + ]; + + dontBuild = true; + + installPhase = '' + lpr=${mfc9140cdnlpr}/opt/brother/Printers/mfc9140cdn + dir=$out/opt/brother/Printers/mfc9140cdn + + interpreter=${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 + patchelf --set-interpreter "$interpreter" "$dir/cupswrapper/brcupsconfpt1" + + substituteInPlace $dir/cupswrapper/cupswrappermfc9140cdn \ + --replace "mkdir -p /usr" ": # mkdir -p /usr" \ + --replace '/opt/brother/''${device_model}/''${printer_model}/lpd/filter''${printer_model}' "$lpr/lpd/filtermfc9140cdn" \ + --replace '/usr/share/ppd/Brother/brother_''${printer_model}_printer_en.ppd' "$dir/cupswrapper/brother_mfc9140cdn_printer_en.ppd" \ + --replace '/usr/share/cups/model/Brother/brother_''${printer_model}_printer_en.ppd' "$dir/cupswrapper/brother_mfc9140cdn_printer_en.ppd" \ + --replace '/opt/brother/Printers/''${printer_model}/' "$lpr/" \ + --replace 'nup="psnup' "nup=\"${psutils}/bin/psnup" \ + --replace '/usr/bin/psnup' "${psutils}/bin/psnup" + + mkdir -p $out/lib/cups/filter + mkdir -p $out/share/cups/model + + ln $dir/cupswrapper/cupswrappermfc9140cdn $out/lib/cups/filter + ln $dir/cupswrapper/brother_mfc9140cdn_printer_en.ppd $out/share/cups/model + + sed -n '/!ENDOFWFILTER!/,/!ENDOFWFILTER!/p' "$dir/cupswrapper/cupswrappermfc9140cdn" | sed '1 br; b; :r s/.*/printer_model=mfc9140cdn; cat <<!ENDOFWFILTER!/' | bash > $out/lib/cups/filter/brother_lpdwrapper_mfc9140cdn + sed -i "/#! \/bin\/sh/a PATH=${lib.makeBinPath [ coreutils gnused gnugrep ]}:\$PATH" $out/lib/cups/filter/brother_lpdwrapper_mfc9140cdn + chmod +x $out/lib/cups/filter/brother_lpdwrapper_mfc9140cdn + ''; + + meta = with lib; { + description = "Brother MFC-9140CDN CUPS wrapper driver"; + homepage = "http://www.brother.com/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix b/pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix new file mode 100644 index 00000000000..4128123d643 --- /dev/null +++ b/pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix @@ -0,0 +1,73 @@ +{ stdenv +, lib +, fetchurl +, dpkg +, makeWrapper +, coreutils +, file +, gawk +, ghostscript +, gnused +, pkgsi686Linux +}: + +stdenv.mkDerivation rec { + pname = "mfc9140cdnlpr"; + version = "1.1.2-1"; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf100405/${pname}-${version}.i386.deb"; + sha256 = "1wqx8njrv078fc3vlq90qyrfg3cw9kr9m6f3qvfnkhq1f95fbslh"; + }; + + unpackPhase = '' + dpkg-deb -x $src $out + ''; + + nativeBuildInputs = [ + dpkg + makeWrapper + ]; + + dontBuild = true; + + installPhase = '' + dir=$out/opt/brother/Printers/mfc9140cdn + + patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $dir/lpd/brmfc9140cdnfilter + + wrapProgram $dir/inf/setupPrintcapij \ + --prefix PATH : ${lib.makeBinPath [ + coreutils + ]} + + substituteInPlace $dir/lpd/filtermfc9140cdn \ + --replace "BR_CFG_PATH=" "BR_CFG_PATH=\"$dir/\" #" \ + --replace "BR_LPD_PATH=" "BR_LPD_PATH=\"$dir/\" #" + + wrapProgram $dir/lpd/filtermfc9140cdn \ + --prefix PATH : ${lib.makeBinPath [ + coreutils + file + ghostscript + gnused + ]} + + substituteInPlace $dir/lpd/psconvertij2 \ + --replace '`which gs`' "${ghostscript}/bin/gs" + + wrapProgram $dir/lpd/psconvertij2 \ + --prefix PATH : ${lib.makeBinPath [ + gnused + gawk + ]} + ''; + + meta = with lib; { + description = "Brother MFC-9140CDN LPR printer driver"; + homepage = "http://www.brother.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ hexa ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 4e43bbe29a2..a097cbad66d 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -208,7 +208,7 @@ self: super: { }); ensime-vim = super.ensime-vim.overrideAttrs (old: { - passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ]; + passthru.python3Dependencies = ps: with ps; [ sexpdata websocket-client ]; dependencies = with self; [ vimproc-vim vimshell-vim self.self forms ]; }); diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix index dedc7578951..b4d26327bdc 100644 --- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix +++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1qgimh58hcx5f646gj2kpd36ayvrdkw616ad8cb3lcm11kg0ag79"; }; - buildFlags = [ "ARCHES=x86_64" ]; + buildFlags = + if stdenv.hostPlatform.system == "x86_64-darwin" then [ "ARCHES=x86_64" ] + else if stdenv.hostPlatform.system == "aarch64-darwin" then [ "ARCHES=arm64" ] + else throw "reattach-to-user-namespace isn't being built for ${stdenv.hostPlatform.system} yet."; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/os-specific/linux/iotop-c/default.nix b/pkgs/os-specific/linux/iotop-c/default.nix new file mode 100644 index 00000000000..47cfa57fe81 --- /dev/null +++ b/pkgs/os-specific/linux/iotop-c/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchFromGitHub, lib, ncurses, pkg-config }: + +stdenv.mkDerivation rec { + pname = "iotop-c"; + version = "1.17"; + + src = fetchFromGitHub { + owner = "Tomas-M"; + repo = "iotop"; + rev = "v${version}"; + sha256 = "0hjy30155c3nijx3jgyn5kpj293632p0j6f3lf5acdfax1ynav86"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ncurses ]; + makeFlags = [ "DESTDIR=$(out)" "TARGET=iotop-c" ]; + + postInstall = '' + mv $out/usr/share/man/man8/{iotop,iotop-c}.8 + ln -s $out/usr/sbin $out/bin + ln -s $out/usr/share $out/share + ''; + + meta = with lib; { + description = "iotop identifies processes that use high amount of input/output requests on your machine"; + homepage = "https://github.com/Tomas-M/iotop"; + maintainers = [ maintainers.arezvov ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 776a422df73..26bb9f82063 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -248,7 +248,7 @@ let DRM_LOAD_EDID_FIRMWARE = yes; VGA_SWITCHEROO = yes; # Hybrid graphics support DRM_GMA500 = whenAtLeast "5.12" module; - DRM_GMA600 = yes; + DRM_GMA600 = whenOlder "5.13" yes; DRM_GMA3600 = whenOlder "5.12" yes; DRM_VMWGFX_FBCON = yes; # necessary for amdgpu polaris support @@ -443,7 +443,7 @@ let SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default # Prevent processes from ptracing non-children processes SECURITY_YAMA = option yes; - DEVKMEM = no; # Disable /dev/kmem + DEVKMEM = whenOlder "5.13" no; # Disable /dev/kmem USER_NS = yes; # Support for user namespaces @@ -698,7 +698,7 @@ let THRUSTMASTER_FF = yes; ZEROPLUS_FF = yes; - MODULE_COMPRESS = yes; + MODULE_COMPRESS = whenOlder "5.13" yes; MODULE_COMPRESS_XZ = yes; SYSVIPC = yes; # System-V IPC diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index f0d41869346..4e2ef7b4652 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12-rc6"; + version = "5.13-rc6"; extraMeta.branch = "5.12"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0w0zk2byimdbcvn8myqaq0ab6lyd43493fnkv9a1407dimpxb03d"; + sha256 = "sha256-PunFd6tOsmrsPItp2QX4TEVxHnvvi1BMSwWio/DTlMU="; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_testing ]; diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 3ac8e6dcd4a..f8bb7c67d8e 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20210216"; + version = "20210608"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "17wrfp7h7xbvncgm1fp103zkyz9n1f820jy6yca1aq208264hjkv"; + sha256 = "08nk353z2lcqsjbm2qdsfapfgrvlfw0rj7r9scr9pllzkjj5n9x3"; }; nativeBuildInputs = [ iucode-tool libarchive ]; diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 5522fa6a456..d6853bf4729 100644..100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -210,7 +210,12 @@ nixBuild() { } nixFlakeBuild() { - if [ -z "$buildHost" ]; then + if [[ -z "$buildHost" && -z "$targetHost" ]] && + ! [ "$action" = switch -o "$action" = boot ] + then + nix "${flakeFlags[@]}" build "$@" + readlink -f ./result + elif [ -z "$buildHost" ]; then nix "${flakeFlags[@]}" build "$@" --out-link "${tmpDir}/result" readlink -f "${tmpDir}/result" else diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 7b100b692a3..7af675de41f 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { sockjs uvloop voluptuous - websocket_client + websocket-client yarl ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index ddc4a81cec9..04d3b5baa4c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -69,7 +69,7 @@ "aws" = ps: with ps; [ aiobotocore ]; "axis" = ps: with ps; [ aiohttp-cors axis paho-mqtt ]; "azure_devops" = ps: with ps; [ ]; # missing inputs: aioazuredevops - "azure_event_hub" = ps: with ps; [ ]; # missing inputs: azure-eventhub + "azure_event_hub" = ps: with ps; [ azure-eventhub ]; "azure_service_bus" = ps: with ps; [ azure-servicebus ]; "baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip "bayesian" = ps: with ps; [ ]; @@ -81,7 +81,7 @@ "bitcoin" = ps: with ps; [ blockchain ]; "bizkaibus" = ps: with ps; [ ]; # missing inputs: bizkaibus "blackbird" = ps: with ps; [ pyblackbird ]; - "blebox" = ps: with ps; [ ]; # missing inputs: blebox_uniapi + "blebox" = ps: with ps; [ blebox-uniapi ]; "blink" = ps: with ps; [ ]; # missing inputs: blinkpy "blinksticklight" = ps: with ps; [ BlinkStick ]; "blinkt" = ps: with ps; [ ]; # missing inputs: blinkt @@ -95,7 +95,7 @@ "bme680" = ps: with ps; [ bme680 smbus-cffi ]; "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected - "bond" = ps: with ps; [ ]; # missing inputs: bond-api + "bond" = ps: with ps; [ bond-api ]; "bosch_shc" = ps: with ps; [ aiohttp-cors boschshcpy ifaddr zeroconf ]; "braviatv" = ps: with ps; [ bravia-tv ]; "broadlink" = ps: with ps; [ broadlink ]; @@ -157,7 +157,7 @@ "deconz" = ps: with ps; [ pydeconz ]; "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa ifaddr netdisco pillow scapy sqlalchemy zeroconf ]; + "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa home-assistant-frontend ifaddr netdisco pillow scapy sqlalchemy zeroconf ]; "delijn" = ps: with ps; [ pydelijn ]; "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors ]; @@ -259,14 +259,14 @@ "filesize" = ps: with ps; [ ]; "filter" = ps: with ps; [ sqlalchemy ]; "fints" = ps: with ps; [ fints ]; - "fireservicerota" = ps: with ps; [ ]; # missing inputs: pyfireservicerota + "fireservicerota" = ps: with ps; [ pyfireservicerota ]; "firmata" = ps: with ps; [ pymata-express ]; "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fixer" = ps: with ps; [ fixerio ]; "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist "flexit" = ps: with ps; [ pymodbus ]; # missing inputs: pyflexit "flic" = ps: with ps; [ pyflic ]; - "flick_electric" = ps: with ps; [ ]; # missing inputs: PyFlick + "flick_electric" = ps: with ps; [ pyflick ]; "flo" = ps: with ps; [ aioflo ]; "flock" = ps: with ps; [ ]; "flume" = ps: with ps; [ pyflume ]; @@ -275,7 +275,7 @@ "flux_led" = ps: with ps; [ flux-led ]; "folder" = ps: with ps; [ ]; "folder_watcher" = ps: with ps; [ watchdog ]; - "foobot" = ps: with ps; [ ]; # missing inputs: foobot_async + "foobot" = ps: with ps; [ foobot-async ]; "forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java "fortios" = ps: with ps; [ fortiosapi ]; "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam @@ -288,7 +288,7 @@ "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; "fronius" = ps: with ps; [ ]; # missing inputs: pyfronius - "frontend" = ps: with ps; [ aiohttp-cors pillow ]; + "frontend" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi "futurenow" = ps: with ps; [ pyfnip ]; "garadget" = ps: with ps; [ ]; @@ -323,11 +323,11 @@ "google_translate" = ps: with ps; [ gtts ]; "google_travel_time" = ps: with ps; [ googlemaps ]; "google_wifi" = ps: with ps; [ ]; - "gpmdp" = ps: with ps; [ websocket_client ]; + "gpmdp" = ps: with ps; [ websocket-client ]; "gpsd" = ps: with ps; [ gps3 ]; "gpslogger" = ps: with ps; [ aiohttp-cors ]; "graphite" = ps: with ps; [ ]; - "gree" = ps: with ps; [ ]; # missing inputs: greeclimate + "gree" = ps: with ps; [ greeclimate ]; "greeneye_monitor" = ps: with ps; [ ]; # missing inputs: greeneye_monitor "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality "group" = ps: with ps; [ ]; @@ -339,7 +339,7 @@ "hangouts" = ps: with ps; [ ]; # missing inputs: hangups "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr "harmony" = ps: with ps; [ aioharmony ]; - "hassio" = ps: with ps; [ aiohttp-cors pillow ]; + "hassio" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ pycec ]; @@ -460,7 +460,7 @@ "local_ip" = ps: with ps; [ ]; "locative" = ps: with ps; [ aiohttp-cors ]; "lock" = ps: with ps; [ ]; - "logbook" = ps: with ps; [ aiohttp-cors pillow sqlalchemy ]; + "logbook" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; "logentries" = ps: with ps; [ ]; "logger" = ps: with ps; [ ]; "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ]; # missing inputs: logi_circle @@ -481,7 +481,7 @@ "mailgun" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymailgunner "manual" = ps: with ps; [ ]; "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "map" = ps: with ps; [ aiohttp-cors pillow ]; + "map" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary "mastodon" = ps: with ps; [ mastodon-py ]; "matrix" = ps: with ps; [ matrix-client ]; @@ -536,7 +536,7 @@ "mullvad" = ps: with ps; [ mullvad-api ]; "mutesync" = ps: with ps; [ mutesync ]; "mvglive" = ps: with ps; [ PyMVGLive ]; - "my" = ps: with ps; [ aiohttp-cors pillow ]; + "my" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi "myq" = ps: with ps; [ pymyq ]; @@ -592,7 +592,7 @@ "ohmconnect" = ps: with ps; [ defusedxml ]; "ombi" = ps: with ps; [ ]; # missing inputs: pyombi "omnilogic" = ps: with ps; [ omnilogic ]; - "onboarding" = ps: with ps; [ aiohttp-cors pillow ]; + "onboarding" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; "ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ]; "onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet "onkyo" = ps: with ps; [ onkyo-eiscp ]; @@ -624,8 +624,8 @@ "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect ]; - "panel_custom" = ps: with ps; [ aiohttp-cors pillow ]; - "panel_iframe" = ps: with ps; [ aiohttp-cors pillow ]; + "panel_custom" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; + "panel_iframe" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; "pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a "pencom" = ps: with ps; [ ]; # missing inputs: pencompy "persistent_notification" = ps: with ps; [ ]; @@ -720,7 +720,7 @@ "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound "sabnzbd" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; # missing inputs: pysabnzbd - "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa pillow ]; + "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa home-assistant-frontend pillow ]; "saj" = ps: with ps; [ ]; # missing inputs: pysaj "samsungtv" = ps: with ps; [ samsungctl samsungtvws wakeonlan ]; "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra @@ -861,7 +861,7 @@ "thinkingcleaner" = ps: with ps; [ ]; # missing inputs: pythinkingcleaner "thomson" = ps: with ps; [ ]; "threshold" = ps: with ps; [ ]; - "tibber" = ps: with ps; [ ]; # missing inputs: pyTibber + "tibber" = ps: with ps; [ pytibber ]; "tikteck" = ps: with ps; [ ]; # missing inputs: tikteck "tile" = ps: with ps; [ pytile ]; "time_date" = ps: with ps; [ ]; @@ -939,7 +939,7 @@ "vultr" = ps: with ps; [ vultr ]; "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32 "wake_on_lan" = ps: with ps; [ wakeonlan ]; - "wallbox" = ps: with ps; [ ]; # missing inputs: wallbox + "wallbox" = ps: with ps; [ wallbox ]; "waqi" = ps: with ps; [ waqiasync ]; "water_heater" = ps: with ps; [ ]; "waterfurnace" = ps: with ps; [ waterfurnace ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 571f630a593..eb2fa70bbb9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -148,9 +148,9 @@ let }); }) - # hass-frontend does not exist in python3.pkgs + # home-assistant-frontend does not exist in python3.pkgs (self: super: { - hass-frontend = self.callPackage ./frontend.nix { }; + home-assistant-frontend = self.callPackage ./frontend.nix { }; }) ]; @@ -229,7 +229,6 @@ in with py.pkgs; buildPythonApplication rec { certifi ciso8601 cryptography - hass-frontend httpx jinja2 pip @@ -304,11 +303,14 @@ in with py.pkgs; buildPythonApplication rec { "awair" "aws" "axis" + "azure_event_hub" "bayesian" "binary_sensor" "blackbird" + "blebox" "blueprint" "bluetooth_le_tracker" + "bond" "bosch_shc" "braviatv" "broadlink" @@ -374,20 +376,25 @@ in with py.pkgs; buildPythonApplication rec { "file" "filesize" "filter" + "fireservicerota" "firmata" + "flick_electric" "flo" "flume" "flunearyou" "flux" "folder" "folder_watcher" + "foobot" "freebox" "freedns" "fritz" "fritzbox" "fritzbox_callmonitor" "frontend" + "garages_amsterdam" "garmin_connect" + "gdacs" "generic" "generic_thermostat" "geo_json_events" @@ -396,8 +403,8 @@ in with py.pkgs; buildPythonApplication rec { "geofency" "geonetnz_quakes" "geonetnz_volcano" - "glances" "gios" + "glances" "gogogate2" "google" "google_assistant" @@ -408,6 +415,7 @@ in with py.pkgs; buildPythonApplication rec { "google_wifi" "gpslogger" "graphite" + "gree" "group" "growatt_server" "guardian" @@ -628,6 +636,7 @@ in with py.pkgs; buildPythonApplication rec { "template" "tesla" "threshold" + "tibber" "tile" "time_date" "timer" @@ -666,6 +675,7 @@ in with py.pkgs; buildPythonApplication rec { "volumio" "vultr" "wake_on_lan" + "wallbox" "water_heater" "waze_travel_time" "weather" @@ -731,6 +741,9 @@ in with py.pkgs; buildPythonApplication rec { "--deselect tests/components/prometheus/test_init.py::test_view" # smhi/test_init.py: Tries to fetch data from the network: socket.gaierror: [Errno -2] Name or service not known "--deselect tests/components/smhi/test_init.py::test_remove_entry" + # wallbox/test_config_flow.py: Tries to connect to api.wall-box.cim: Failed to establish a new connection: [Errno -2] Name or service not known + "--deselect tests/components/wallbox/test_config_flow.py::test_form_invalid_auth" + "--deselect tests/components/wallbox/test_config_flow.py::test_form_cannot_connect" # tests are located in tests/ "tests" # dynamically add packages required for component tests @@ -792,6 +805,7 @@ in with py.pkgs; buildPythonApplication rec { tests = { inherit (nixosTests) home-assistant; }; + python = py; }; meta = with lib; { diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 6629005b07d..5d8678a6267 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -23,6 +23,7 @@ import subprocess import sys import tarfile import tempfile +from functools import reduce from io import BytesIO from typing import Dict, Optional, Set, Any from urllib.request import urlopen @@ -31,7 +32,7 @@ from rich.console import Console from rich.table import Table COMPONENT_PREFIX = "homeassistant.components" -PKG_SET = "python3Packages" +PKG_SET = "home-assistant.python.pkgs" # If some requirements are matched by multiple Python packages, # the following can be used to choose one of them @@ -187,10 +188,6 @@ def main() -> None: missing_reqs.append(name) else: build_inputs[component] = (attr_paths, missing_reqs) - n_diff = len(reqs) > len(build_inputs[component]) - if n_diff > 0: - print("Component {} is missing {} dependencies".format(component, n_diff)) - print("missing requirements: {}".format(missing_reqs)) with open(os.path.dirname(sys.argv[0]) + "/component-packages.nix", "w") as f: f.write("# Generated by parse-requirements.py\n") @@ -210,6 +207,12 @@ def main() -> None: f.write(" };\n") f.write("}\n") + supported_components = reduce(lambda n, c: n + (build_inputs[c][1] == []), + components.keys(), 0) + total_components = len(components) + print(f"{supported_components} / {total_components} components supported, " + f"i.e. {supported_components / total_components:.2%}") + if outdated: table = Table(title="Outdated dependencies") table.add_column("Package") diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/servers/irc/solanum/default.nix index 8080d82a185..d5e70799cf5 100644 --- a/pkgs/servers/irc/solanum/default.nix +++ b/pkgs/servers/irc/solanum/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { ./dont-create-logdir.patch ]; + postPatch = '' + substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/solanum' + ''; + configureFlags = [ "--enable-epoll" "--enable-ipv6" @@ -57,7 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An IRCd for unified networks"; homepage = "https://github.com/solanum-ircd/solanum"; - license = licenses.gpl2Only; + license = licenses.gpl2Plus; maintainers = with maintainers; [ hexa ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index 20ae2a8f5c8..ea59f73b88d 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -230,10 +230,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dsmmsk913b50rs4ihk8pafc1gp1i1k1fnbf63ki0j5xdknpli55"; + sha256 = "0fs3fy6k4wmzh0z6c4rl313f5px81pj0viqxj1prksza4j7iymmi"; type = "gem"; }; - version = "1.452.0"; + version = "1.465.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -263,10 +263,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0803g2c1hhdk6fbliww12in4czsxj47fip9dpl35hbqsnrpjc4y9"; + sha256 = "0mm96blh0515lymkwamcnv5jih36v0yykcqx4fr0wwvwmyh637zv"; type = "gem"; }; - version = "1.94.1"; + version = "1.95.1"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -875,10 +875,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z3d4y6xg8prn3zdjw1qpqrnziq1d3zigqil4sxjj0pbr46gc1d6"; + sha256 = "1hwir9b9zy0asy0vap7zfqv75lbws4a1pmh74lhqd2rndv32vfc5"; type = "gem"; }; - version = "2.17.0"; + version = "2.18.0"; }; faraday = { dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"]; @@ -1170,10 +1170,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mq67if5lq388raxa5rh43z6g5zlqh9yixcja4s81p9dzrsj4i3x"; + sha256 = "1dr7cj8km01kjsiwrx7n3qxr264ga13ll15s4h9dbbyj5m8kxqd2"; type = "gem"; }; - version = "1.4.3"; + version = "1.5.0"; }; i18n = { dependencies = ["concurrent-ruby"]; @@ -1524,14 +1524,15 @@ version = "1.0.3"; }; mini_portile2 = { + dependencies = ["net-ftp"]; groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2"; + sha256 = "0a2y04km3aciybk12yimkqn0ycrzy23iygl116n7addix9xdii3s"; type = "gem"; }; - version = "2.5.1"; + version = "2.5.2"; }; minitest = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -1573,6 +1574,17 @@ }; version = "2.1.1"; }; + net-ftp = { + dependencies = ["net-protocol" "time"]; + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gx09b00k454fgn7q41r9xs5j5v9qj8xhfxnm650cns1ywcmzkil"; + type = "gem"; + }; + version = "0.1.2"; + }; net-ldap = { groups = ["default"]; platforms = []; @@ -1583,6 +1595,16 @@ }; version = "0.17.0"; }; + net-protocol = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01wxv9sl2lcf5212vqzblw9k241ga54cppi4dk5y9ylhllbqag8a"; + type = "gem"; + }; + version = "0.1.0"; + }; net-scp = { dependencies = ["net-ssh"]; groups = ["default" "development"]; @@ -1620,10 +1642,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0"; + sha256 = "1z4x366icbl9w13pk50vxx5kywlksvhxqxrpv8f5xpjxfl3jl64z"; type = "gem"; }; - version = "1.11.3"; + version = "1.11.6"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -1927,10 +1949,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q34mqihyg7i46z0pbbkyw58fwmkq7a7315apaqmj41zp6akyjf1"; + sha256 = "0lmaq05a257m9588a81wql3a5p039f221f0dmq57bm2qjwxydjmj"; type = "gem"; }; - version = "5.3.0"; + version = "5.3.2"; }; pundit = { dependencies = ["activesupport"]; @@ -2332,10 +2354,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0chjr6i0g7frbp7dhi4d83ppf7akkdaw7mcgcwbxd6a9mairafpp"; + sha256 = "1xhay8qn3p5f3g6x8i6zh372zk5w2wjrv9dksysxal1r5brkly1w"; type = "gem"; }; - version = "1.14.0"; + version = "1.15.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2493,10 +2515,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dzwz30gr2mjdr70gnz2mmplhfqldz0jhdw1n3ric0y3yj81m02d"; + sha256 = "1m8l8mwvbf6cdd7jqy0l6cg2zxi1qs8ya78jail8pvi4ay7hglm1"; type = "gem"; }; - version = "7.0.9"; + version = "7.0.11"; }; simple-navigation = { dependencies = ["activesupport"]; @@ -2504,10 +2526,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pkj5z48k90v9v53gckl1b0jsix08kpl6qkgsd4pkc7cva8dbqid"; + sha256 = "0izbisjc4ng77v79x6jv1z3a8fkpdb5isgjcrx60d8vl743x7hab"; type = "gem"; }; - version = "4.1.0"; + version = "4.3.0"; }; simple_form = { dependencies = ["actionpack" "activemodel"]; @@ -2688,6 +2710,16 @@ }; version = "2.0.10"; }; + time = { + groups = ["default" "development" "pam_authentication" "production" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ayfwm8b0c6n0z34vwfpmy83lf1gd0mq7jbybzarkqp2ylmdlzvy"; + type = "gem"; + }; + version = "0.1.0"; + }; tpm-key_attestation = { dependencies = ["bindata" "openssl-signature_algorithm"]; groups = ["default"]; @@ -2853,10 +2885,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "038igpmkpmn0nw0k7s4db8x88af1nwcy7wzh9m9c9q4p74h7rii0"; + sha256 = "0zd5aid4ya47xlfsaf1mlf83vkyljpnsvgwqhchf0cs7353kdss9"; type = "gem"; }; - version = "3.12.2"; + version = "3.13.0"; }; webpacker = { dependencies = ["activesupport" "rack-proxy" "railties" "semantic_range"]; @@ -2864,10 +2896,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xpjdbcnsapk9y1hbryxan3a0yks37j59l3ifpmlfrqfxp08anvr"; + sha256 = "0bs6m6annfb2pazb5wb2l3lbnkaa4438ixldnamlx9hg7z3j646h"; type = "gem"; }; - version = "5.3.0"; + version = "5.4.0"; }; webpush = { dependencies = ["hkdf" "jwt"]; diff --git a/pkgs/servers/mastodon/package.json b/pkgs/servers/mastodon/package.json index be41b4d5925..7d540007909 100644 --- a/pkgs/servers/mastodon/package.json +++ b/pkgs/servers/mastodon/package.json @@ -1,5 +1,5 @@ { - "version": "3.4.0", + "version": "3.4.1", "name": "@tootsuite/mastodon", "license": "AGPL-3.0-or-later", "engines": { @@ -60,11 +60,11 @@ }, "private": true, "dependencies": { - "@babel/core": "^7.14.0", - "@babel/plugin-proposal-decorators": "^7.13.15", + "@babel/core": "^7.14.3", + "@babel/plugin-proposal-decorators": "^7.14.2", "@babel/plugin-transform-react-inline-elements": "^7.12.13", - "@babel/plugin-transform-runtime": "^7.13.15", - "@babel/preset-env": "^7.14.1", + "@babel/plugin-transform-runtime": "^7.14.3", + "@babel/preset-env": "^7.14.4", "@babel/preset-react": "^7.13.13", "@babel/runtime": "^7.14.0", "@gamestdio/websocket": "^0.3.2", @@ -85,11 +85,11 @@ "color-blend": "^3.0.1", "compression-webpack-plugin": "^6.1.1", "cross-env": "^7.0.3", - "css-loader": "^5.2.4", + "css-loader": "^5.2.6", "cssnano": "^4.1.11", "detect-passive-events": "^2.0.3", - "dotenv": "^9.0.1", - "emoji-mart": "Gargron/emoji-mart#build", + "dotenv": "^9.0.2", + "emoji-mart": "^3.0.1", "es6-symbol": "^3.1.3", "escape-html": "^1.0.3", "exif-js": "^2.3.0", @@ -138,9 +138,9 @@ "react-redux-loading-bar": "^4.0.8", "react-router-dom": "^4.1.1", "react-router-scroll-4": "^1.0.0-beta.1", - "react-select": "^4.3.0", + "react-select": "^4.3.1", "react-sparklines": "^1.7.0", - "react-swipeable-views": "^0.13.9", + "react-swipeable-views": "^0.14.0", "react-textarea-autosize": "^8.3.2", "react-toggle": "^4.1.2", "redis": "^3.1.2", @@ -152,8 +152,8 @@ "requestidlecallback": "^0.3.0", "reselect": "^4.0.0", "rimraf": "^3.0.2", - "sass": "^1.32.12", - "sass-loader": "^10.1.1", + "sass": "^1.34.0", + "sass-loader": "^10.2.0", "stacktrace-js": "^2.0.2", "stringz": "^2.1.0", "substring-trie": "^1.0.2", @@ -165,23 +165,23 @@ "uuid": "^8.3.1", "webpack": "^4.46.0", "webpack-assets-manifest": "^4.0.6", - "webpack-bundle-analyzer": "^4.4.1", + "webpack-bundle-analyzer": "^4.4.2", "webpack-cli": "^3.3.12", "webpack-merge": "^5.7.3", "wicg-inert": "^3.1.1", - "ws": "^7.4.5", + "ws": "^7.4.6", "kind-of": "^6.0.3" }, "devDependencies": { "@testing-library/jest-dom": "^5.12.0", - "@testing-library/react": "^11.2.6", + "@testing-library/react": "^11.2.7", "babel-eslint": "^10.1.0", - "babel-jest": "^26.6.3", - "eslint": "^7.26.0", - "eslint-plugin-import": "~2.22.1", + "babel-jest": "^27.0.2", + "eslint": "^7.27.0", + "eslint-plugin-import": "~2.23.4", "eslint-plugin-jsx-a11y": "~6.4.1", "eslint-plugin-promise": "~5.1.0", - "eslint-plugin-react": "~7.23.2", + "eslint-plugin-react": "~7.24.0", "jest": "^26.6.3", "raf": "^3.4.1", "react-intl-translations-manager": "^5.0.3", diff --git a/pkgs/servers/mastodon/resolutions.patch b/pkgs/servers/mastodon/resolutions.patch index 4160647123f..f1f30725f1d 100644 --- a/pkgs/servers/mastodon/resolutions.patch +++ b/pkgs/servers/mastodon/resolutions.patch @@ -1,13 +1,13 @@ diff --git a/package.json b/package.json -index 5bc1f6bf3..8cc22a403 100644 +index f485b1370..ce8e42699 100644 --- a/package.json +++ b/package.json @@ -168,7 +168,8 @@ "webpack-cli": "^3.3.12", "webpack-merge": "^5.7.3", "wicg-inert": "^3.1.1", -- "ws": "^7.4.5" -+ "ws": "^7.4.5", +- "ws": "^7.4.6" ++ "ws": "^7.4.6", + "kind-of": "^6.0.3" }, "devDependencies": { @@ -23,12 +23,12 @@ index 5bc1f6bf3..8cc22a403 100644 "bufferutil": "^4.0.3", "utf-8-validate": "^5.0.5" diff --git a/yarn.lock b/yarn.lock -index 6c8bcf549..bda3adbe8 100644 +index b8ea0f369..32e929c0d 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -5833,6 +5833,11 @@ is-binary-path@~2.1.0: +@@ -5939,6 +5939,11 @@ is-boolean-object@^1.1.0: dependencies: - binary-extensions "^2.0.0" + call-bind "^1.0.2" +is-buffer@^1.1.5: + version "1.1.6" @@ -38,7 +38,7 @@ index 6c8bcf549..bda3adbe8 100644 is-callable@^1.1.4, is-callable@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" -@@ -6769,7 +6774,26 @@ killable@^1.0.1: +@@ -6971,7 +6976,26 @@ killable@^1.0.1: resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg== diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index e7e8135bef2..be64ff23150 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -2,8 +2,8 @@ { fetchgit, applyPatches }: let src = fetchgit { url = "https://github.com/tootsuite/mastodon.git"; - rev = "v3.4.0"; - sha256 = "0wa1j4iin6nlb1p5lxzgldzgr0vhrmm835gj2zqadw37vpsxdis3"; + rev = "v3.4.1"; + sha256 = "1pg3yh6gfzwrhzm35s6ydpny4fj117z2avi4rck5d7n20j8s2hf5"; }; in applyPatches { inherit src; diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix index 9aa1e187187..4ccfa7d8ebc 100644 --- a/pkgs/servers/mastodon/version.nix +++ b/pkgs/servers/mastodon/version.nix @@ -1 +1 @@ -"3.4.0" +"3.4.1" diff --git a/pkgs/servers/mastodon/version.patch b/pkgs/servers/mastodon/version.patch index eb0bd393735..08bc2f827a8 100644 --- a/pkgs/servers/mastodon/version.patch +++ b/pkgs/servers/mastodon/version.patch @@ -3,7 +3,7 @@ diff -Naur --label a/package.json --label b/package.json a/package.json b/packag +++ b/package.json @@ -1,4 +1,5 @@ { -+ "version": "3.4.0", ++ "version": "3.4.1", "name": "@tootsuite/mastodon", "license": "AGPL-3.0-or-later", "engines": { diff --git a/pkgs/servers/mastodon/yarn.nix b/pkgs/servers/mastodon/yarn.nix index 9d22eb6bd5a..01aa11cfcac 100644 --- a/pkgs/servers/mastodon/yarn.nix +++ b/pkgs/servers/mastodon/yarn.nix @@ -18,27 +18,27 @@ }; } { - name = "_babel_compat_data___compat_data_7.14.0.tgz"; + name = "_babel_compat_data___compat_data_7.14.4.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz"; - sha1 = "a901128bce2ad02565df95e6ecbf195cf9465919"; + name = "_babel_compat_data___compat_data_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.4.tgz"; + sha1 = "45720fe0cecf3fd42019e1d12cc3d27fadc98d58"; }; } { - name = "_babel_core___core_7.14.0.tgz"; + name = "_babel_core___core_7.14.3.tgz"; path = fetchurl { - name = "_babel_core___core_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.0.tgz"; - sha1 = "47299ff3ec8d111b493f1a9d04bf88c04e728d88"; + name = "_babel_core___core_7.14.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.3.tgz"; + sha1 = "5395e30405f0776067fbd9cf0884f15bfb770a38"; }; } { - name = "_babel_generator___generator_7.14.0.tgz"; + name = "_babel_generator___generator_7.14.3.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.0.tgz"; - sha1 = "0f35d663506c43e4f10898fbda0d752ec75494be"; + name = "_babel_generator___generator_7.14.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.3.tgz"; + sha1 = "0c2652d91f7bddab7cccc6ba8157e4f40dcedb91"; }; } { @@ -74,27 +74,27 @@ }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz"; - sha1 = "6e91dccf15e3f43e5556dffe32d860109887563c"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz"; + sha1 = "33ebd0ffc34248051ee2089350a929ab02f2a516"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.13.11.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.3.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.13.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz"; - sha1 = "30d30a005bca2c953f5653fc25091a492177f4f6"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.3.tgz"; + sha1 = "832111bcf4f57ca57a4c5b1a000fc125abc6554a"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.0.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.4.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.0.tgz"; - sha1 = "38367d3dab125b12f94273de418f4df23a11a15e"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.4.tgz"; + sha1 = "abf888d836a441abee783c75229279748705dc42"; }; } { @@ -130,6 +130,14 @@ }; } { + name = "_babel_helper_function_name___helper_function_name_7.14.2.tgz"; + path = fetchurl { + name = "_babel_helper_function_name___helper_function_name_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz"; + sha1 = "397688b590760b6ef7725b5f0860c82427ebaac2"; + }; + } + { name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; path = fetchurl { name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; @@ -154,14 +162,6 @@ }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.0.tgz"; - path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz"; - sha1 = "6aa4bb678e0f8c22f58cdb79451d30494461b091"; - }; - } - { name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; path = fetchurl { name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; @@ -178,11 +178,11 @@ }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.14.0.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.2.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz"; - sha1 = "8fcf78be220156f22633ee204ea81f73f826a8ad"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz"; + sha1 = "ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5"; }; } { @@ -218,14 +218,6 @@ }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.13.0.tgz"; - path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz"; - sha1 = "6034b7b51943094cb41627848cb219cb02be1d24"; - }; - } - { name = "_babel_helper_replace_supers___helper_replace_supers_7.13.12.tgz"; path = fetchurl { name = "_babel_helper_replace_supers___helper_replace_supers_7.13.12.tgz"; @@ -234,6 +226,22 @@ }; } { + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.3.tgz"; + path = fetchurl { + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz"; + sha1 = "ca17b318b859d107f0e9b722d58cf12d94436600"; + }; + } + { + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz"; + path = fetchurl { + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz"; + sha1 = "b2ab16875deecfff3ddfcd539bc315f72998d836"; + }; + } + { name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; path = fetchurl { name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; @@ -306,11 +314,11 @@ }; } { - name = "_babel_parser___parser_7.14.0.tgz"; + name = "_babel_parser___parser_7.14.3.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.0.tgz"; - sha1 = "2f0ebfed92bcddcc8395b91f1895191ce2760380"; + name = "_babel_parser___parser_7.14.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.3.tgz"; + sha1 = "9b530eecb071fd0c93519df25c5ff9f14759f298"; }; } { @@ -322,11 +330,11 @@ }; } { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.13.15.tgz"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.14.2.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.13.15.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz"; - sha1 = "80e549df273a3b3050431b148c892491df1bcc5b"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.2.tgz"; + sha1 = "3a2085abbf5d5f962d480dbc81347385ed62eb1e"; }; } { @@ -338,91 +346,91 @@ }; } { - name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.13.11.tgz"; + name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.14.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.13.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.13.11.tgz"; - sha1 = "6fcbba4a962702c17e5371a0c7b39afde186d703"; + name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.14.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.3.tgz"; + sha1 = "5a527e2cae4a4753119c3a3e7f64ecae8ccf1360"; }; } { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.13.15.tgz"; + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.14.2.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.13.15.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.15.tgz"; - sha1 = "e91ccfef2dc24dd5bd5dcc9fc9e2557c684ecfb8"; + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.14.2.tgz"; + sha1 = "e68c3c5e4a6a08834456568256fc3e71b93590cf"; }; } { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.13.8.tgz"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.14.2.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz"; - sha1 = "876a1f6966e1dec332e8c9451afda3bebcdf2e1d"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.2.tgz"; + sha1 = "01ebabd7c381cff231fa43e302939a9de5be9d9f"; }; } { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.13.tgz"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.14.2.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz"; - sha1 = "393be47a4acd03fa2af6e3cde9b06e33de1b446d"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.2.tgz"; + sha1 = "62542f94aa9ce8f6dba79eec698af22112253791"; }; } { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.13.8.tgz"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.14.2.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz"; - sha1 = "bf1fb362547075afda3634ed31571c5901afef7b"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.2.tgz"; + sha1 = "830b4e2426a782e8b2878fbfe2cba85b70cbf98c"; }; } { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.13.8.tgz"; + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.14.2.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz"; - sha1 = "93fa78d63857c40ce3c8c3315220fd00bfbb4e1a"; + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.2.tgz"; + sha1 = "222348c080a1678e0e74ea63fe76f275882d1fd7"; }; } { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.13.8.tgz"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.14.2.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz"; - sha1 = "3730a31dafd3c10d8ccd10648ed80a2ac5472ef3"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.2.tgz"; + sha1 = "425b11dc62fc26939a2ab42cbba680bdf5734546"; }; } { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.13.tgz"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.14.2.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz"; - sha1 = "bd9da3188e787b5120b4f9d465a8261ce67ed1db"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.2.tgz"; + sha1 = "82b4cc06571143faf50626104b335dd71baa4f9e"; }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.13.8.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.14.4.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz"; - sha1 = "5d210a4d727d6ce3b18f9de82cc99a3964eed60a"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.4.tgz"; + sha1 = "0e2b4de419915dc0b409378e829412e2031777c4"; }; } { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.13.8.tgz"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.14.2.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz"; - sha1 = "3ad6bd5901506ea996fc31bdcf3ccfa2bed71107"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.2.tgz"; + sha1 = "150d4e58e525b16a9a1431bd5326c4eed870d717"; }; } { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.13.12.tgz"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.14.2.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz"; - sha1 = "ba9feb601d422e0adea6760c2bd6bbb7bfec4866"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz"; + sha1 = "df8171a8b9c43ebf4c1dabe6311b432d83e1b34e"; }; } { @@ -618,19 +626,19 @@ }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.1.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.1.tgz"; - sha1 = "ac1b3a8e3d8cbb31efc6b9be2f74eb9823b74ab2"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.4.tgz"; + sha1 = "caf140b0b2e2462c509553d140e6d0abefb61ed8"; }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.13.0.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.14.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz"; - sha1 = "0265155075c42918bf4d3a4053134176ad9b533b"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.4.tgz"; + sha1 = "a83c15503fc71a0f99e876fdce7dadbc6575ec3a"; }; } { @@ -642,11 +650,11 @@ }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.17.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.14.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.17.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz"; - sha1 = "678d96576638c19d5b36b332504d3fd6e06dea27"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.4.tgz"; + sha1 = "acbec502e9951f30f4441eaca1d2f29efade59ed"; }; } { @@ -706,11 +714,11 @@ }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.0.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.2.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.0.tgz"; - sha1 = "589494b5b290ff76cf7f59c798011f6d77026553"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.2.tgz"; + sha1 = "6622806fe1a7c07a1388444222ef9535f2ca17b0"; }; } { @@ -762,11 +770,11 @@ }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.13.0.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.14.2.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz"; - sha1 = "8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz"; + sha1 = "e4290f72e0e9e831000d066427c4667098decc31"; }; } { @@ -834,11 +842,11 @@ }; } { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.13.15.tgz"; + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.14.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.13.15.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.15.tgz"; - sha1 = "2eddf585dd066b84102517e10a577f24f76a9cd7"; + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.14.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.3.tgz"; + sha1 = "1fd885a2d0de1d3c223795a4e9be72c2db4515cf"; }; } { @@ -898,11 +906,11 @@ }; } { - name = "_babel_preset_env___preset_env_7.14.1.tgz"; + name = "_babel_preset_env___preset_env_7.14.4.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.14.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.1.tgz"; - sha1 = "b55914e2e68885ea03f69600b2d3537e54574a93"; + name = "_babel_preset_env___preset_env_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.4.tgz"; + sha1 = "73fc3228c59727e5e974319156f304f0d6685a2d"; }; } { @@ -954,19 +962,19 @@ }; } { - name = "_babel_traverse___traverse_7.14.0.tgz"; + name = "_babel_traverse___traverse_7.14.2.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.0.tgz"; - sha1 = "cea0dc8ae7e2b1dec65f512f39f3483e8cc95aef"; + name = "_babel_traverse___traverse_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz"; + sha1 = "9201a8d912723a831c2679c7ebbf2fe1416d765b"; }; } { - name = "_babel_types___types_7.14.1.tgz"; + name = "_babel_types___types_7.14.4.tgz"; path = fetchurl { - name = "_babel_types___types_7.14.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz"; - sha1 = "095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db"; + name = "_babel_types___types_7.14.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.4.tgz"; + sha1 = "bfd6980108168593b38b3eb48a24aa026b919bc0"; }; } { @@ -986,11 +994,11 @@ }; } { - name = "_emotion_cache___cache_11.1.3.tgz"; + name = "_emotion_cache___cache_11.4.0.tgz"; path = fetchurl { - name = "_emotion_cache___cache_11.1.3.tgz"; - url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.1.3.tgz"; - sha1 = "c7683a9484bcd38d5562f2b9947873cf66829afd"; + name = "_emotion_cache___cache_11.4.0.tgz"; + url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.4.0.tgz"; + sha1 = "293fc9d9a7a38b9aad8e9337e5014366c3b09ac0"; }; } { @@ -1194,6 +1202,14 @@ }; } { + name = "_jest_transform___transform_27.0.2.tgz"; + path = fetchurl { + name = "_jest_transform___transform_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.2.tgz"; + sha1 = "b073b7c589e3f4b842102468875def2bb722d6b5"; + }; + } + { name = "_jest_types___types_25.5.0.tgz"; path = fetchurl { name = "_jest_types___types_25.5.0.tgz"; @@ -1210,6 +1226,14 @@ }; } { + name = "_jest_types___types_27.0.2.tgz"; + path = fetchurl { + name = "_jest_types___types_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-27.0.2.tgz"; + sha1 = "e153d6c46bda0f2589f0702b071f9898c7bbd37e"; + }; + } + { name = "_npmcli_move_file___move_file_1.0.1.tgz"; path = fetchurl { name = "_npmcli_move_file___move_file_1.0.1.tgz"; @@ -1266,11 +1290,11 @@ }; } { - name = "_testing_library_react___react_11.2.6.tgz"; + name = "_testing_library_react___react_11.2.7.tgz"; path = fetchurl { - name = "_testing_library_react___react_11.2.6.tgz"; - url = "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.6.tgz"; - sha1 = "586a23adc63615985d85be0c903f374dab19200b"; + name = "_testing_library_react___react_11.2.7.tgz"; + url = "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.7.tgz"; + sha1 = "b29e2e95c6765c815786c0bc1d5aed9cb2bf7818"; }; } { @@ -1282,11 +1306,11 @@ }; } { - name = "_types_babel__core___babel__core_7.1.9.tgz"; + name = "_types_babel__core___babel__core_7.1.14.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.9.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.9.tgz"; - sha1 = "77e59d438522a6fb898fa43dc3455c6e72f3963d"; + name = "_types_babel__core___babel__core_7.1.14.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz"; + sha1 = "faaeefc4185ec71c389f4501ee5ec84b170cc402"; }; } { @@ -1538,6 +1562,14 @@ }; } { + name = "_types_yargs___yargs_16.0.3.tgz"; + path = fetchurl { + name = "_types_yargs___yargs_16.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.3.tgz"; + sha1 = "4b6d35bb8e680510a7dc2308518a80ee1ef27e01"; + }; + } + { name = "_webassemblyjs_ast___ast_1.9.0.tgz"; path = fetchurl { name = "_webassemblyjs_ast___ast_1.9.0.tgz"; @@ -1842,6 +1874,14 @@ }; } { + name = "ajv___ajv_8.5.0.tgz"; + path = fetchurl { + name = "ajv___ajv_8.5.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz"; + sha1 = "695528274bcb5afc865446aa275484049a18ae4b"; + }; + } + { name = "alphanum_sort___alphanum_sort_1.0.2.tgz"; path = fetchurl { name = "alphanum_sort___alphanum_sort_1.0.2.tgz"; @@ -2074,11 +2114,11 @@ }; } { - name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; + name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz"; path = fetchurl { - name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz"; - sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; + name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz"; + sha1 = "6ef638b43312bd401b4c6199fdec7e2dc9e9a123"; }; } { @@ -2258,6 +2298,14 @@ }; } { + name = "babel_jest___babel_jest_27.0.2.tgz"; + path = fetchurl { + name = "babel_jest___babel_jest_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.2.tgz"; + sha1 = "7dc18adb01322acce62c2af76ea2c7cd186ade37"; + }; + } + { name = "babel_loader___babel_loader_8.2.2.tgz"; path = fetchurl { name = "babel_loader___babel_loader_8.2.2.tgz"; @@ -2290,6 +2338,14 @@ }; } { + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.1.tgz"; + path = fetchurl { + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.1.tgz"; + sha1 = "a6d10e484c93abff0f4e95f437dad26e5736ea11"; + }; + } + { name = "babel_plugin_lodash___babel_plugin_lodash_3.3.4.tgz"; path = fetchurl { name = "babel_plugin_lodash___babel_plugin_lodash_3.3.4.tgz"; @@ -2370,6 +2426,14 @@ }; } { + name = "babel_preset_jest___babel_preset_jest_27.0.1.tgz"; + path = fetchurl { + name = "babel_preset_jest___babel_preset_jest_27.0.1.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.1.tgz"; + sha1 = "7a50c75d16647c23a2cf5158d5bb9eb206b10e20"; + }; + } + { name = "babel_runtime___babel_runtime_6.26.0.tgz"; path = fetchurl { name = "babel_runtime___babel_runtime_6.26.0.tgz"; @@ -2618,27 +2682,11 @@ }; } { - name = "browserslist___browserslist_4.14.5.tgz"; - path = fetchurl { - name = "browserslist___browserslist_4.14.5.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz"; - sha1 = "1c751461a102ddc60e40993639b709be7f2c4015"; - }; - } - { - name = "browserslist___browserslist_4.14.7.tgz"; - path = fetchurl { - name = "browserslist___browserslist_4.14.7.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz"; - sha1 = "c071c1b3622c1c2e790799a37bb09473a4351cb6"; - }; - } - { - name = "browserslist___browserslist_4.16.3.tgz"; + name = "browserslist___browserslist_4.16.6.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.16.3.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz"; - sha1 = "340aa46940d7db878748567c5dea24a48ddf3717"; + name = "browserslist___browserslist_4.16.6.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz"; + sha1 = "d7901277a5a88e554ed305b183ec9b0c08f66fa2"; }; } { @@ -2826,27 +2874,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001143.tgz"; - path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001143.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001143.tgz"; - sha1 = "560f2cfb9f313d1d7e52eb8dac0e4e36c8821c0d"; - }; - } - { - name = "caniuse_lite___caniuse_lite_1.0.30001159.tgz"; - path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001159.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz"; - sha1 = "bebde28f893fa9594dadcaa7d6b8e2aa0299df20"; - }; - } - { - name = "caniuse_lite___caniuse_lite_1.0.30001191.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001191.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001191.tgz"; - sha1 = "bacb432b6701f690c8c5f7c680166b9a9f0843d9"; + name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz"; + sha1 = "bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"; }; } { @@ -2954,6 +2986,14 @@ }; } { + name = "ci_info___ci_info_3.2.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz"; + sha1 = "2876cb948a498797b5236f0095bc057d0dca38b6"; + }; + } + { name = "cipher_base___cipher_base_1.0.4.tgz"; path = fetchurl { name = "cipher_base___cipher_base_1.0.4.tgz"; @@ -3146,14 +3186,6 @@ }; } { - name = "colorette___colorette_1.2.1.tgz"; - path = fetchurl { - name = "colorette___colorette_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz"; - sha1 = "4d0b921325c14faf92633086a536db6e89564b1b"; - }; - } - { name = "colorette___colorette_1.2.2.tgz"; path = fetchurl { name = "colorette___colorette_1.2.2.tgz"; @@ -3274,14 +3306,6 @@ }; } { - name = "contains_path___contains_path_0.1.0.tgz"; - path = fetchurl { - name = "contains_path___contains_path_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz"; - sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a"; - }; - } - { name = "content_disposition___content_disposition_0.5.3.tgz"; path = fetchurl { name = "content_disposition___content_disposition_0.5.3.tgz"; @@ -3514,11 +3538,11 @@ }; } { - name = "css_loader___css_loader_5.2.4.tgz"; + name = "css_loader___css_loader_5.2.6.tgz"; path = fetchurl { - name = "css_loader___css_loader_5.2.4.tgz"; - url = "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.4.tgz"; - sha1 = "e985dcbce339812cb6104ef3670f08f9893a1536"; + name = "css_loader___css_loader_5.2.6.tgz"; + url = "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.6.tgz"; + sha1 = "c3c82ab77fea1f360e587d871a6811f4450cc8d1"; }; } { @@ -3978,11 +4002,11 @@ }; } { - name = "dns_packet___dns_packet_1.3.1.tgz"; + name = "dns_packet___dns_packet_1.3.4.tgz"; path = fetchurl { - name = "dns_packet___dns_packet_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz"; - sha1 = "12aa426981075be500b910eedcd0b47dd7deda5a"; + name = "dns_packet___dns_packet_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz"; + sha1 = "e3455065824a2507ba886c55a89963bb107dec6f"; }; } { @@ -4098,11 +4122,11 @@ }; } { - name = "dotenv___dotenv_9.0.1.tgz"; + name = "dotenv___dotenv_9.0.2.tgz"; path = fetchurl { - name = "dotenv___dotenv_9.0.1.tgz"; - url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.1.tgz"; - sha1 = "a889a28a3a515812dde1e7f8183ef5cdf3186b97"; + name = "dotenv___dotenv_9.0.2.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz"; + sha1 = "dacc20160935a37dea6364aa1bef819fb9b6ab05"; }; } { @@ -4146,27 +4170,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.574.tgz"; - path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.574.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.574.tgz"; - sha1 = "bdd87f62fe70165e5c862a0acf0cee9889e23aa3"; - }; - } - { - name = "electron_to_chromium___electron_to_chromium_1.3.603.tgz"; - path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.603.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.603.tgz"; - sha1 = "1b71bec27fb940eccd79245f6824c63d5f7e8abf"; - }; - } - { - name = "electron_to_chromium___electron_to_chromium_1.3.672.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.736.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.672.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.672.tgz"; - sha1 = "3a6e335016dab4bc584d5292adc4f98f54541f6a"; + name = "electron_to_chromium___electron_to_chromium_1.3.736.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.736.tgz"; + sha1 = "f632d900a1f788dab22fec9c62ec5c9c8f0c4052"; }; } { @@ -4186,11 +4194,11 @@ }; } { - name = "934f314fd8322276765066e8a2a6be5bac61b1cf"; + name = "emoji_mart___emoji_mart_3.0.1.tgz"; path = fetchurl { - name = "934f314fd8322276765066e8a2a6be5bac61b1cf"; - url = "https://codeload.github.com/Gargron/emoji-mart/tar.gz/934f314fd8322276765066e8a2a6be5bac61b1cf"; - sha1 = "1768aa6ab3d6b926f457e082bd4ed7279f6fc9cf"; + name = "emoji_mart___emoji_mart_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-3.0.1.tgz"; + sha1 = "9ce86706e02aea0506345f98464814a662ca54c6"; }; } { @@ -4314,6 +4322,14 @@ }; } { + name = "es_abstract___es_abstract_1.18.3.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.18.3.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz"; + sha1 = "25c4c3380a27aa203c44b2b685bba94da31b63e0"; + }; + } + { name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; path = fetchurl { name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; @@ -4410,6 +4426,14 @@ }; } { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + }; + } + { name = "escodegen___escodegen_1.14.3.tgz"; path = fetchurl { name = "escodegen___escodegen_1.14.3.tgz"; @@ -4434,19 +4458,19 @@ }; } { - name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; + name = "eslint_module_utils___eslint_module_utils_2.6.1.tgz"; path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; - sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6"; + name = "eslint_module_utils___eslint_module_utils_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz"; + sha1 = "b51be1e473dd0de1c5ea638e22429c2490ea8233"; }; } { - name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz"; + name = "eslint_plugin_import___eslint_plugin_import_2.23.4.tgz"; path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz"; - sha1 = "0896c7e6a0cf44109a2d97b95903c2bb689d7702"; + name = "eslint_plugin_import___eslint_plugin_import_2.23.4.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz"; + sha1 = "8dceb1ed6b73e46e50ec9a5bb2411b645e7d3d97"; }; } { @@ -4466,11 +4490,11 @@ }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.23.2.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.24.0.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.23.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz"; - sha1 = "2d2291b0f95c03728b55869f01102290e792d494"; + name = "eslint_plugin_react___eslint_plugin_react_7.24.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz"; + sha1 = "eadedfa351a6f36b490aa17f4fa9b14e842b9eb4"; }; } { @@ -4522,11 +4546,11 @@ }; } { - name = "eslint___eslint_7.26.0.tgz"; + name = "eslint___eslint_7.27.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.26.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.26.0.tgz"; - sha1 = "d416fdcdcb3236cd8f282065312813f8c13982f6"; + name = "eslint___eslint_7.27.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.27.0.tgz"; + sha1 = "665a1506d8f95655c9274d84bd78f7166b07e9c7"; }; } { @@ -5394,6 +5418,14 @@ }; } { + name = "has_bigints___has_bigints_1.0.1.tgz"; + path = fetchurl { + name = "has_bigints___has_bigints_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz"; + sha1 = "64fe6acb020673e3b78db035a5af69aa9d07b113"; + }; + } + { name = "has_flag___has_flag_1.0.0.tgz"; path = fetchurl { name = "has_flag___has_flag_1.0.0.tgz"; @@ -5426,6 +5458,14 @@ }; } { + name = "has_symbols___has_symbols_1.0.2.tgz"; + path = fetchurl { + name = "has_symbols___has_symbols_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz"; + sha1 = "165d3070c00309752a1236a479331e3ac56f1423"; + }; + } + { name = "has_unicode___has_unicode_2.0.1.tgz"; path = fetchurl { name = "has_unicode___has_unicode_2.0.1.tgz"; @@ -6074,6 +6114,14 @@ }; } { + name = "is_bigint___is_bigint_1.0.2.tgz"; + path = fetchurl { + name = "is_bigint___is_bigint_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz"; + sha1 = "ffb381442503235ad245ea89e45b3dbff040ee5a"; + }; + } + { name = "is_binary_path___is_binary_path_1.0.1.tgz"; path = fetchurl { name = "is_binary_path___is_binary_path_1.0.1.tgz"; @@ -6090,6 +6138,14 @@ }; } { + name = "is_boolean_object___is_boolean_object_1.1.1.tgz"; + path = fetchurl { + name = "is_boolean_object___is_boolean_object_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz"; + sha1 = "3c0878f035cb821228d350d2e1e36719716a3de8"; + }; + } + { name = "is_buffer___is_buffer_1.1.6.tgz"; path = fetchurl { name = "is_buffer___is_buffer_1.1.6.tgz"; @@ -6106,6 +6162,14 @@ }; } { + name = "is_callable___is_callable_1.2.3.tgz"; + path = fetchurl { + name = "is_callable___is_callable_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz"; + sha1 = "8b1e0500b73a1d76c70487636f368e519de8db8e"; + }; + } + { name = "is_ci___is_ci_2.0.0.tgz"; path = fetchurl { name = "is_ci___is_ci_2.0.0.tgz"; @@ -6114,6 +6178,14 @@ }; } { + name = "is_ci___is_ci_3.0.0.tgz"; + path = fetchurl { + name = "is_ci___is_ci_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz"; + sha1 = "c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994"; + }; + } + { name = "is_color_stop___is_color_stop_1.1.0.tgz"; path = fetchurl { name = "is_color_stop___is_color_stop_1.1.0.tgz"; @@ -6122,11 +6194,11 @@ }; } { - name = "is_core_module___is_core_module_2.2.0.tgz"; + name = "is_core_module___is_core_module_2.4.0.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz"; - sha1 = "97037ef3d52224d85163f5597b2b63d9afed981a"; + name = "is_core_module___is_core_module_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz"; + sha1 = "8e9fc8e15027b011418026e98f0e6f4d86305cc1"; }; } { @@ -6298,6 +6370,14 @@ }; } { + name = "is_number_object___is_number_object_1.0.5.tgz"; + path = fetchurl { + name = "is_number_object___is_number_object_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz"; + sha1 = "6edfaeed7950cff19afedce9fbfca9ee6dd289eb"; + }; + } + { name = "is_number___is_number_3.0.0.tgz"; path = fetchurl { name = "is_number___is_number_3.0.0.tgz"; @@ -6386,6 +6466,14 @@ }; } { + name = "is_regex___is_regex_1.1.3.tgz"; + path = fetchurl { + name = "is_regex___is_regex_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz"; + sha1 = "d029f9aff6448b93ebbe3f33dac71511fdcbef9f"; + }; + } + { name = "is_resolvable___is_resolvable_1.1.0.tgz"; path = fetchurl { name = "is_resolvable___is_resolvable_1.1.0.tgz"; @@ -6418,6 +6506,14 @@ }; } { + name = "is_string___is_string_1.0.6.tgz"; + path = fetchurl { + name = "is_string___is_string_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz"; + sha1 = "3fe5d5992fb0d93404f32584d4b0179a71b54a5f"; + }; + } + { name = "is_symbol___is_symbol_1.0.3.tgz"; path = fetchurl { name = "is_symbol___is_symbol_1.0.3.tgz"; @@ -6426,6 +6522,14 @@ }; } { + name = "is_symbol___is_symbol_1.0.4.tgz"; + path = fetchurl { + name = "is_symbol___is_symbol_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz"; + sha1 = "a6dac93b635b063ca6872236de88910a57af139c"; + }; + } + { name = "is_typedarray___is_typedarray_1.0.0.tgz"; path = fetchurl { name = "is_typedarray___is_typedarray_1.0.0.tgz"; @@ -6650,6 +6754,14 @@ }; } { + name = "jest_haste_map___jest_haste_map_27.0.2.tgz"; + path = fetchurl { + name = "jest_haste_map___jest_haste_map_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.2.tgz"; + sha1 = "3f1819400c671237e48b4d4b76a80a0dbed7577f"; + }; + } + { name = "jest_jasmine2___jest_jasmine2_26.6.3.tgz"; path = fetchurl { name = "jest_jasmine2___jest_jasmine2_26.6.3.tgz"; @@ -6706,6 +6818,14 @@ }; } { + name = "jest_regex_util___jest_regex_util_27.0.1.tgz"; + path = fetchurl { + name = "jest_regex_util___jest_regex_util_27.0.1.tgz"; + url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.1.tgz"; + sha1 = "69d4b1bf5b690faa3490113c47486ed85dd45b68"; + }; + } + { name = "jest_resolve_dependencies___jest_resolve_dependencies_26.6.3.tgz"; path = fetchurl { name = "jest_resolve_dependencies___jest_resolve_dependencies_26.6.3.tgz"; @@ -6746,6 +6866,14 @@ }; } { + name = "jest_serializer___jest_serializer_27.0.1.tgz"; + path = fetchurl { + name = "jest_serializer___jest_serializer_27.0.1.tgz"; + url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.1.tgz"; + sha1 = "2464d04dcc33fb71dc80b7c82e3c5e8a08cb1020"; + }; + } + { name = "jest_snapshot___jest_snapshot_26.6.2.tgz"; path = fetchurl { name = "jest_snapshot___jest_snapshot_26.6.2.tgz"; @@ -6762,6 +6890,14 @@ }; } { + name = "jest_util___jest_util_27.0.2.tgz"; + path = fetchurl { + name = "jest_util___jest_util_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.2.tgz"; + sha1 = "fc2c7ace3c75ae561cf1e5fdb643bf685a5be7c7"; + }; + } + { name = "jest_validate___jest_validate_26.6.2.tgz"; path = fetchurl { name = "jest_validate___jest_validate_26.6.2.tgz"; @@ -6794,6 +6930,14 @@ }; } { + name = "jest_worker___jest_worker_27.0.2.tgz"; + path = fetchurl { + name = "jest_worker___jest_worker_27.0.2.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.2.tgz"; + sha1 = "4ebeb56cef48b3e7514552f80d0d80c0129f0b05"; + }; + } + { name = "jest___jest_26.6.3.tgz"; path = fetchurl { name = "jest___jest_26.6.3.tgz"; @@ -6882,6 +7026,14 @@ }; } { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"; + }; + } + { name = "json_schema___json_schema_0.2.3.tgz"; path = fetchurl { name = "json_schema___json_schema_0.2.3.tgz"; @@ -7122,11 +7274,11 @@ }; } { - name = "load_json_file___load_json_file_2.0.0.tgz"; + name = "load_json_file___load_json_file_4.0.0.tgz"; path = fetchurl { - name = "load_json_file___load_json_file_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz"; - sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + name = "load_json_file___load_json_file_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz"; + sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; }; } { @@ -7202,6 +7354,14 @@ }; } { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + path = fetchurl { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + } + { name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; path = fetchurl { name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; @@ -7274,6 +7434,14 @@ }; } { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + path = fetchurl { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a"; + }; + } + { name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; path = fetchurl { name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; @@ -7282,6 +7450,14 @@ }; } { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + path = fetchurl { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + }; + } + { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; path = fetchurl { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; @@ -7498,6 +7674,14 @@ }; } { + name = "micromatch___micromatch_4.0.4.tgz"; + path = fetchurl { + name = "micromatch___micromatch_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; + sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9"; + }; + } + { name = "miller_rabin___miller_rabin_4.0.1.tgz"; path = fetchurl { name = "miller_rabin___miller_rabin_4.0.1.tgz"; @@ -7754,11 +7938,11 @@ }; } { - name = "nanoid___nanoid_3.1.22.tgz"; + name = "nanoid___nanoid_3.1.23.tgz"; path = fetchurl { - name = "nanoid___nanoid_3.1.22.tgz"; - url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz"; - sha1 = "b35f8fb7d151990a8aebd5aa5015c03cf726f844"; + name = "nanoid___nanoid_3.1.23.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz"; + sha1 = "f744086ce7c2bc47ee0a8472574d5c78e4183a81"; }; } { @@ -7866,27 +8050,11 @@ }; } { - name = "node_releases___node_releases_1.1.61.tgz"; - path = fetchurl { - name = "node_releases___node_releases_1.1.61.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz"; - sha1 = "707b0fca9ce4e11783612ba4a2fcba09047af16e"; - }; - } - { - name = "node_releases___node_releases_1.1.67.tgz"; + name = "node_releases___node_releases_1.1.72.tgz"; path = fetchurl { - name = "node_releases___node_releases_1.1.67.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz"; - sha1 = "28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"; - }; - } - { - name = "node_releases___node_releases_1.1.71.tgz"; - path = fetchurl { - name = "node_releases___node_releases_1.1.71.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz"; - sha1 = "cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"; + name = "node_releases___node_releases_1.1.72.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz"; + sha1 = "14802ab6b1039a79a0c7d662b610a5bbd76eacbe"; }; } { @@ -8018,6 +8186,14 @@ }; } { + name = "object_inspect___object_inspect_1.10.3.tgz"; + path = fetchurl { + name = "object_inspect___object_inspect_1.10.3.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz"; + sha1 = "c2aa7d2d09f50c99375704f7a0adf24c5782d369"; + }; + } + { name = "object_inspect___object_inspect_1.8.0.tgz"; path = fetchurl { name = "object_inspect___object_inspect_1.8.0.tgz"; @@ -8074,11 +8250,11 @@ }; } { - name = "object.entries___object.entries_1.1.3.tgz"; + name = "object.entries___object.entries_1.1.4.tgz"; path = fetchurl { - name = "object.entries___object.entries_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz"; - sha1 = "c601c7f168b62374541a07ddbd3e2d5e4f7711a6"; + name = "object.entries___object.entries_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz"; + sha1 = "43ccf9a50bc5fd5b649d45ab1a579f24e088cafd"; }; } { @@ -8106,11 +8282,11 @@ }; } { - name = "object.values___object.values_1.1.3.tgz"; + name = "object.values___object.values_1.1.4.tgz"; path = fetchurl { - name = "object.values___object.values_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz"; - sha1 = "eaa8b1e17589f02f698db093f7c62ee1699742ee"; + name = "object.values___object.values_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz"; + sha1 = "0d273762833e816b693a637d30073e7051535b30"; }; } { @@ -8386,14 +8562,6 @@ }; } { - name = "parse_json___parse_json_2.2.0.tgz"; - path = fetchurl { - name = "parse_json___parse_json_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; - }; - } - { name = "parse_json___parse_json_4.0.0.tgz"; path = fetchurl { name = "parse_json___parse_json_4.0.0.tgz"; @@ -8538,11 +8706,11 @@ }; } { - name = "path_type___path_type_2.0.0.tgz"; + name = "path_type___path_type_3.0.0.tgz"; path = fetchurl { - name = "path_type___path_type_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz"; - sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + name = "path_type___path_type_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz"; + sha1 = "cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"; }; } { @@ -8642,6 +8810,14 @@ }; } { + name = "picomatch___picomatch_2.3.0.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; + sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; + }; + } + { name = "pify___pify_2.3.0.tgz"; path = fetchurl { name = "pify___pify_2.3.0.tgz"; @@ -8650,6 +8826,14 @@ }; } { + name = "pify___pify_3.0.0.tgz"; + path = fetchurl { + name = "pify___pify_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + } + { name = "pify___pify_4.0.1.tgz"; path = fetchurl { name = "pify___pify_4.0.1.tgz"; @@ -8706,6 +8890,14 @@ }; } { + name = "pkg_up___pkg_up_2.0.0.tgz"; + path = fetchurl { + name = "pkg_up___pkg_up_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz"; + sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + }; + } + { name = "pluralize___pluralize_1.2.1.tgz"; path = fetchurl { name = "pluralize___pluralize_1.2.1.tgz"; @@ -9058,11 +9250,11 @@ }; } { - name = "postcss___postcss_8.2.10.tgz"; + name = "postcss___postcss_8.3.0.tgz"; path = fetchurl { - name = "postcss___postcss_8.2.10.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-8.2.10.tgz"; - sha1 = "ca7a042aa8aff494b334d0ff3e9e77079f6f702b"; + name = "postcss___postcss_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.3.0.tgz"; + sha1 = "b1a713f6172ca427e3f05ef1303de8b65683325f"; }; } { @@ -9546,11 +9738,11 @@ }; } { - name = "react_select___react_select_4.3.0.tgz"; + name = "react_select___react_select_4.3.1.tgz"; path = fetchurl { - name = "react_select___react_select_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/react-select/-/react-select-4.3.0.tgz"; - sha1 = "6bde634ae7a378b49f3833c85c126f533483fa2e"; + name = "react_select___react_select_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz"; + sha1 = "389fc07c9bc7cf7d3c377b7a05ea18cd7399cb81"; }; } { @@ -9562,27 +9754,27 @@ }; } { - name = "react_swipeable_views_core___react_swipeable_views_core_0.13.7.tgz"; + name = "react_swipeable_views_core___react_swipeable_views_core_0.14.0.tgz"; path = fetchurl { - name = "react_swipeable_views_core___react_swipeable_views_core_0.13.7.tgz"; - url = "https://registry.yarnpkg.com/react-swipeable-views-core/-/react-swipeable-views-core-0.13.7.tgz"; - sha1 = "c082b553f26e83fd20fc17f934200eb717023c8a"; + name = "react_swipeable_views_core___react_swipeable_views_core_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/react-swipeable-views-core/-/react-swipeable-views-core-0.14.0.tgz"; + sha1 = "6ac443a7cc7bc5ea022fbd549292bb5fff361cce"; }; } { - name = "react_swipeable_views_utils___react_swipeable_views_utils_0.13.9.tgz"; + name = "react_swipeable_views_utils___react_swipeable_views_utils_0.14.0.tgz"; path = fetchurl { - name = "react_swipeable_views_utils___react_swipeable_views_utils_0.13.9.tgz"; - url = "https://registry.yarnpkg.com/react-swipeable-views-utils/-/react-swipeable-views-utils-0.13.9.tgz"; - sha1 = "a66e98f2f4502d8b00182901f80d13b2f903e10f"; + name = "react_swipeable_views_utils___react_swipeable_views_utils_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/react-swipeable-views-utils/-/react-swipeable-views-utils-0.14.0.tgz"; + sha1 = "6b76e251906747482730c22002fe47ab1014ba32"; }; } { - name = "react_swipeable_views___react_swipeable_views_0.13.9.tgz"; + name = "react_swipeable_views___react_swipeable_views_0.14.0.tgz"; path = fetchurl { - name = "react_swipeable_views___react_swipeable_views_0.13.9.tgz"; - url = "https://registry.yarnpkg.com/react-swipeable-views/-/react-swipeable-views-0.13.9.tgz"; - sha1 = "d6a6c508bf5288ad55509f9c65916db5df0f2cec"; + name = "react_swipeable_views___react_swipeable_views_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/react-swipeable-views/-/react-swipeable-views-0.14.0.tgz"; + sha1 = "149c0df3d92220cc89e3f6d5c04a78dfe46f9b54"; }; } { @@ -9634,11 +9826,11 @@ }; } { - name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; + name = "read_pkg_up___read_pkg_up_3.0.0.tgz"; path = fetchurl { - name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; - sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + name = "read_pkg_up___read_pkg_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz"; + sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07"; }; } { @@ -9650,11 +9842,11 @@ }; } { - name = "read_pkg___read_pkg_2.0.0.tgz"; + name = "read_pkg___read_pkg_3.0.0.tgz"; path = fetchurl { - name = "read_pkg___read_pkg_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz"; - sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + name = "read_pkg___read_pkg_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz"; + sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; }; } { @@ -10242,19 +10434,19 @@ }; } { - name = "sass_loader___sass_loader_10.1.1.tgz"; + name = "sass_loader___sass_loader_10.2.0.tgz"; path = fetchurl { - name = "sass_loader___sass_loader_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.1.tgz"; - sha1 = "4ddd5a3d7638e7949065dd6e9c7c04037f7e663d"; + name = "sass_loader___sass_loader_10.2.0.tgz"; + url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.2.0.tgz"; + sha1 = "3d64c1590f911013b3fa48a0b22a83d5e1494716"; }; } { - name = "sass___sass_1.32.12.tgz"; + name = "sass___sass_1.34.0.tgz"; path = fetchurl { - name = "sass___sass_1.32.12.tgz"; - url = "https://registry.yarnpkg.com/sass/-/sass-1.32.12.tgz"; - sha1 = "a2a47ad0f1c168222db5206444a30c12457abb9f"; + name = "sass___sass_1.34.0.tgz"; + url = "https://registry.yarnpkg.com/sass/-/sass-1.34.0.tgz"; + sha1 = "e46d5932d8b0ecc4feb846d861f26a578f7f7172"; }; } { @@ -10634,6 +10826,14 @@ }; } { + name = "source_map_js___source_map_js_0.6.2.tgz"; + path = fetchurl { + name = "source_map_js___source_map_js_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz"; + sha1 = "0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"; + }; + } + { name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; path = fetchurl { name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; @@ -10938,11 +11138,11 @@ }; } { - name = "string.prototype.matchall___string.prototype.matchall_4.0.4.tgz"; + name = "string.prototype.matchall___string.prototype.matchall_4.0.5.tgz"; path = fetchurl { - name = "string.prototype.matchall___string.prototype.matchall_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz"; - sha1 = "608f255e93e072107f5de066f81a2dfb78cf6b29"; + name = "string.prototype.matchall___string.prototype.matchall_4.0.5.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz"; + sha1 = "59370644e1db7e4c0c045277690cf7b01203c4da"; }; } { @@ -11162,6 +11362,14 @@ }; } { + name = "supports_color___supports_color_8.1.1.tgz"; + path = fetchurl { + name = "supports_color___supports_color_8.1.1.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz"; + sha1 = "cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"; + }; + } + { name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz"; path = fetchurl { name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz"; @@ -11194,11 +11402,11 @@ }; } { - name = "table___table_6.0.4.tgz"; + name = "table___table_6.7.1.tgz"; path = fetchurl { - name = "table___table_6.0.4.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.0.4.tgz"; - sha1 = "c523dd182177e926c723eb20e1b341238188aa0d"; + name = "table___table_6.7.1.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz"; + sha1 = "ee05592b7143831a8c94f3cee6aae4c1ccef33e2"; }; } { @@ -11634,6 +11842,14 @@ }; } { + name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; + path = fetchurl { + name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; + sha1 = "085e215625ec3162574dc8859abee78a59b14471"; + }; + } + { name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; path = fetchurl { name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; @@ -12050,11 +12266,11 @@ }; } { - name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.4.1.tgz"; + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.4.2.tgz"; path = fetchurl { - name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.4.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.1.tgz"; - sha1 = "c71fb2eaffc10a4754d7303b224adb2342069da1"; + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz"; + sha1 = "39898cf6200178240910d629705f0f3493f7d666"; }; } { @@ -12162,6 +12378,14 @@ }; } { + name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; + path = fetchurl { + name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; + sha1 = "13757bc89b209b049fe5d86430e21cf40a89a8e6"; + }; + } + { name = "which_module___which_module_2.0.0.tgz"; path = fetchurl { name = "which_module___which_module_2.0.0.tgz"; @@ -12282,11 +12506,11 @@ }; } { - name = "ws___ws_7.4.5.tgz"; + name = "ws___ws_7.4.6.tgz"; path = fetchurl { - name = "ws___ws_7.4.5.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz"; - sha1 = "a484dd851e9beb6fdb420027e3885e8ce48986c1"; + name = "ws___ws_7.4.6.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz"; + sha1 = "5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"; }; } { diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 934ce797d50..a5b2f14e9d5 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; rev = "v${version}"; - sha256 = "sha256-0nwE3+GkJAvz5s8G23TvLVO8ykQK0ZIwEWAaTWHHOuU="; + sha256 = "sha256-PXahSrA+jBWreFhqCp1Ar9yYfIJGJfU2xH88Ax3fdkE="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-FRXG0HmYfum9G/LYm6oWLLx1ZYQ3Jq7qV/mq6ofN9f5="; + vendorSha256 = "sha256-Iscojrn6wVnweOQV1GvhZ4QjUdTfDLOsCP1hVR4u/b4="; doCheck = false; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 1043b70b584..7420fa22e63 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, fetchpatch }: buildGoModule rec { pname = "grafana"; - version = "8.0.1"; + version = "8.0.2"; excludedPackages = [ "release_publisher" ]; @@ -10,15 +10,24 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-Vs/4urH/XuoVly26YfhFbf/T3x5jdS4BgrVStuTHaHo="; + sha256 = "sha256-kCsrLZ0EbuMwqqDvUvhm8+B/vh6FpeJ5zkwste+qwyQ="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-b05nUApLjdQW5vbS56HUK+/GXKcHo2UAHybfe6ZTr3U="; + sha256 = "sha256-QBMGLN3MjYJcv2vbs9GHfrCixcV7nH+Ox3o6/YtRYak="; }; - vendorSha256 = "sha256-iwB1JtekxFYSHjaV+TqBDqnyE5zt3RJ4dQmf12AA53U="; + vendorSha256 = "sha256-x7sSVIim/TOhMTbnRK/fpgxiSRSO8KwGILTE2i1gU3U="; + + patches = [ + # https://github.com/grafana/grafana/pull/35635 (fixes declarative plugins for us) + (fetchpatch { + url = "https://github.com/grafana/grafana/commit/5b5cb948092bdb85e0378fd9ae01b564c4bf65f1.patch"; + sha256 = "sha256-MnCjfLiHsBSWPcxVZ2dC4q8x1/TjzR8uyQhH2Jzgx7o="; + includes = [ "pkg/util/filepath.go" ]; + }) + ]; preBuild = '' # The testcase makes an API call against grafana.com: @@ -32,7 +41,12 @@ buildGoModule rec { # + (string) (len=5) "error": (string) (len=171) "Failed to send request: Get \"https://grafana.com/api/plugins/repo/test\": dial tcp: lookup grafana.com on [::1]:53: read udp [::1]:48019->[::1]:53: read: connection refused", # + (string) (len=7) "message": (string) (len=24) "Failed to install plugin" # } - sed -ie '/func TestPluginInstallAccess/a t.Skip();' pkg/tests/api/plugins/api_install_test.go + sed -i -e '/func TestPluginInstallAccess/a t.Skip();' pkg/tests/api/plugins/api_install_test.go + + # Skip a flaky test (https://github.com/NixOS/nixpkgs/pull/126928#issuecomment-861424128) + sed -i -e '/it should change folder successfully and return correct result/{N;s/$/\nt.Skip();/}'\ + pkg/services/libraryelements/libraryelements_patch_test.go + # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go rm -r scripts/go diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix index c0648c97e68..024825c9abe 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-clock-panel"; - version = "1.1.1"; - zipHash = "sha256-SvZyg7r+XG6i7jqYwxpPn6ZzJc7qmtfPtyphYppURDk="; + version = "1.1.3"; + zipHash = "sha256-80JaMhY/EduSWvFrScfua99DGhT/FJUqY/kl0CafKCs="; meta = with lib; { description = "Clock panel for Grafana"; license = licenses.asl20; diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 12ae858ea3a..5e7c4d5368a 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -6,13 +6,13 @@ }: let - version = "2.7.0"; + version = "2.7.4"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-w26pwGDL2j7qbporUzZATgw7E//E6xwahCbXv35QNnc="; + sha256 = "sha256-3cvrdWBXRM5F8qFEqbe8ru1U0wBqCkRxK7GAV0beJNk="; }; runtimeDeps = [ diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index d3f999d34f4..af968cdf331 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -232,7 +232,7 @@ GEM multipart-post (2.1.1) mustache (1.1.1) nio4r (2.5.7) - nokogiri (1.11.3) + nokogiri (1.11.5) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.5) diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 4b3ce8ce219..974df1ed4ea 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -1284,10 +1284,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0"; + sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m"; type = "gem"; }; - version = "1.11.3"; + version = "1.11.5"; }; nokogumbo = { dependencies = ["nokogiri"]; diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index 4a73c5770d2..20fc0f6f0c0 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -1,14 +1,14 @@ { gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir -, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkg-config }: +, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkg-config, nixosTests }: with lib; gnustep.stdenv.mkDerivation rec { pname = "SOGo"; - version = "5.0.1"; + version = "5.1.1"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOGo-${version}"; - sha256 = "145hdlwnqds5zmpxbh4yainsbv5vy99ji93d6pl7xkbqwncfi80i"; + sha256 = "19qkznk20fi47zxvg24hqnim5bpjlawk76w04jgd93yqakidl8ax"; }; nativeBuildInputs = [ gnustep.make makeWrapper python3 ]; @@ -66,9 +66,11 @@ with lib; gnustep.stdenv.mkDerivation rec { done ''; + passthru.tests.sogo = nixosTests.sogo; + meta = { description = "A very fast and scalable modern collaboration suite (groupware)"; - license = with licenses; [ gpl2 lgpl21 ]; + license = with licenses; [ gpl2Only lgpl21Only ]; homepage = "https://sogo.nu/"; platforms = platforms.linux; maintainers = with maintainers; [ ajs124 das_j ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ed6108d5148..bcdaa6db4d0 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3132,5 +3132,3573 @@ lib.makeScope newScope (self: with self; { buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; - +||||||| 4b7c8d538e1 + appres = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXt }: stdenv.mkDerivation { + name = "appres-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/appres-1.0.5.tar.bz2"; + sha256 = "0a2r4sxky3k7b3kdb5pbv709q9b5zi3gxjz336wl66f828vqkbgz"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + bdftopcf = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "bdftopcf-1.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2"; + sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + bitmap = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + name = "bitmap-1.0.9"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/bitmap-1.0.9.tar.gz"; + sha256 = "0kzbv5wh02798l77y9y8d8sjkmzm9cvsn3rjh8a86v5waj50apsb"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXaw xbitmaps libXmu xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + editres = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + name = "editres-1.0.7"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/editres-1.0.7.tar.bz2"; + sha256 = "04awfwmy3f9f0bchidc4ssbgrbicn5gzasg3jydpfnp5513d76h8"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + encodings = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "encodings-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/encodings-1.0.5.tar.bz2"; + sha256 = "0caafx0yqqnqyvbalxhh3mb0r9v36xmcy5zjhygb2i508dhy35mx"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontadobe100dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-adobe-100dpi-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-adobe-100dpi-1.0.3.tar.bz2"; + sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontadobe75dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-adobe-75dpi-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2"; + sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontadobeutopia100dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-adobe-utopia-100dpi-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2"; + sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontadobeutopia75dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-adobe-utopia-75dpi-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2"; + sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontadobeutopiatype1 = callPackage + ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + name = "font-adobe-utopia-type1-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2"; + sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontalias = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "font-alias-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-alias-1.0.3.tar.bz2"; + sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontarabicmisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-arabic-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2"; + sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbh100dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-bh-100dpi-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2"; + sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbh75dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-bh-75dpi-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2"; + sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbhlucidatypewriter100dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-bh-lucidatypewriter-100dpi-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2"; + sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbhlucidatypewriter75dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-bh-lucidatypewriter-75dpi-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2"; + sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbhttf = callPackage + ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + name = "font-bh-ttf-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bh-ttf-1.0.3.tar.bz2"; + sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbhtype1 = callPackage + ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + name = "font-bh-type1-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bh-type1-1.0.3.tar.bz2"; + sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbitstream100dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-bitstream-100dpi-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2"; + sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbitstream75dpi = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-bitstream-75dpi-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2"; + sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontbitstreamtype1 = callPackage + ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + name = "font-bitstream-type1-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-bitstream-type1-1.0.3.tar.bz2"; + sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontcronyxcyrillic = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-cronyx-cyrillic-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2"; + sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontcursormisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-cursor-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-cursor-misc-1.0.3.tar.bz2"; + sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontdaewoomisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-daewoo-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-daewoo-misc-1.0.3.tar.bz2"; + sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontdecmisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-dec-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-dec-misc-1.0.3.tar.bz2"; + sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontibmtype1 = callPackage + ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + name = "font-ibm-type1-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-ibm-type1-1.0.3.tar.bz2"; + sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontisasmisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-isas-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-isas-misc-1.0.3.tar.bz2"; + sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontjismisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-jis-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-jis-misc-1.0.3.tar.bz2"; + sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontmicromisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-micro-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-micro-misc-1.0.3.tar.bz2"; + sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontmisccyrillic = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-misc-cyrillic-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-misc-cyrillic-1.0.3.tar.bz2"; + sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontmiscethiopic = callPackage + ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + name = "font-misc-ethiopic-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-misc-ethiopic-1.0.3.tar.bz2"; + sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontmiscmeltho = callPackage + ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + name = "font-misc-meltho-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-misc-meltho-1.0.3.tar.bz2"; + sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontmiscmisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-misc-misc-1.1.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-misc-misc-1.1.2.tar.bz2"; + sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontmuttmisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-mutt-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-mutt-misc-1.0.3.tar.bz2"; + sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontschumachermisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + name = "font-schumacher-misc-1.1.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-schumacher-misc-1.1.2.tar.bz2"; + sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontscreencyrillic = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-screen-cyrillic-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-screen-cyrillic-1.0.4.tar.bz2"; + sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontsonymisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-sony-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-sony-misc-1.0.3.tar.bz2"; + sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontsunmisc = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-sun-misc-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-sun-misc-1.0.3.tar.bz2"; + sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fonttosfnt = callPackage + ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation { + name = "fonttosfnt-1.2.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/fonttosfnt-1.2.1.tar.bz2"; + sha256 = "16r51h5wfy85wnbq3q8v8a184hb25c3ksjgix0mlcywdz7qkbj07"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libfontenc freetype xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontutil = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "font-util-1.3.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-util-1.3.1.tar.bz2"; + sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontwinitzkicyrillic = callPackage + ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + name = "font-winitzki-cyrillic-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2"; + sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + fontxfree86type1 = callPackage + ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + name = "font-xfree86-type1-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2"; + sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config mkfontscale ]; + buildInputs = [ ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + gccmakedep = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "gccmakedep-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2"; + sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + iceauth = callPackage + ({ stdenv, pkg-config, fetchurl, libICE, xorgproto }: stdenv.mkDerivation { + name = "iceauth-1.0.8"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2"; + sha256 = "1ik0mdidmyvy48hn8p2hwvf3535rf3m96hhf0mvcqrbj44x23vp6"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libICE xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + ico = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "ico-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/ico-1.0.5.tar.bz2"; + sha256 = "0gvpwfk9kvlfn631dgizc45qc2qqjn9pavdp2q7qb3drkvr64fyp"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + imake = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + name = "imake-1.0.8"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/util/imake-1.0.8.tar.bz2"; + sha256 = "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libAppleWM = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + name = "libAppleWM-1.4.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2"; + sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libFS = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { + name = "libFS-1.0.8"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2"; + sha256 = "03xxyvpfa3rhqcld4p2chkil482jn9cp80hj17jdybcv2hkkgqf8"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xtrans ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libICE = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { + name = "libICE-1.0.10"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2"; + sha256 = "0j638yvmyna2k4mz465jywgdybgdchdqppfx6xfazg7l5khxr1kg"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xtrans ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libSM = callPackage + ({ stdenv, pkg-config, fetchurl, libICE, libuuid, xorgproto, xtrans }: stdenv.mkDerivation { + name = "libSM-1.2.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2"; + sha256 = "1fwwfq9v3sqmpzpscymswxn76xhxnysa24pfim1mcpxhvjcl89id"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libICE libuuid xorgproto xtrans ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libWindowsWM = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + name = "libWindowsWM-1.0.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2"; + sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libX11 = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { + name = "libX11-1.7.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libX11-1.7.0.tar.bz2"; + sha256 = "0m6bfwllr3pq2c00l51y62yiq15kphc8dw69zf67qhwmclxzkj1n"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libxcb xtrans ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXScrnSaver = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + name = "libXScrnSaver-1.2.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2"; + sha256 = "1y4vx1vabg7j9hamp0vrfrax5b0lmgm3h0lbgbb3hnkv3dd0f5zr"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXTrap = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXt }: stdenv.mkDerivation { + name = "libXTrap-1.0.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2"; + sha256 = "0bi5wxj6avim61yidh9fd3j4n8czxias5m8vss9vhxjnk1aksdwg"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXau = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + name = "libXau-1.0.9"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2"; + sha256 = "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXaw = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXmu, libXpm, libXt }: stdenv.mkDerivation { + name = "libXaw-1.0.14"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2"; + sha256 = "13kg59r3086383g1dyhnwxanhp2frssh9062mrgn34nzlf7gkbkn"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext xorgproto libXmu libXpm libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXaw3d = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, libXpm, xorgproto, libXt }: stdenv.mkDerivation { + name = "libXaw3d-1.6.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2"; + sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext libXmu libXpm xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXcomposite = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { + name = "libXcomposite-0.4.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2"; + sha256 = "13sfcglvz87vl58hd9rszwr73z0z4nwga3c12rfh7f5s2ln8l8dk"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXfixes ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXcursor = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation { + name = "libXcursor-1.2.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2"; + sha256 = "10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXfixes libXrender ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXdamage = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { + name = "libXdamage-1.1.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2"; + sha256 = "0igaw2akjf712y3rv7lx473jigxmcv9rs9y8sbrvbhya8f30cd5p"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXfixes ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXdmcp = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + name = "libXdmcp-1.1.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2"; + sha256 = "0ab53h0rkq721ihk5hi469x500f3pgbkm1wy01yf24x5m923nli0"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXext = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "libXext-1.3.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2"; + sha256 = "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXfixes = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + name = "libXfixes-5.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2"; + sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXfont = callPackage + ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { + name = "libXfont-1.5.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2"; + sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXfont2 = callPackage + ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { + name = "libXfont2-2.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2"; + sha256 = "1rk9pjxcm01lbr1dxhnvk4f2qrn6zp068qjbvvz5w0z5d0rin5bd"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXft = callPackage + ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { + name = "libXft-2.3.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2"; + sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ fontconfig freetype libX11 xorgproto libXrender ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXi = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXfixes }: stdenv.mkDerivation { + name = "libXi-1.7.10"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2"; + sha256 = "0q8hz3slga3w3ch8wp0k7ay9ilhz315qnab0w1y2x9w3cf7hv8rn"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext libXfixes ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXinerama = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + name = "libXinerama-1.1.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2"; + sha256 = "086p0axqj57nvkaqa6r00dnr9kyrn1m8blgf0zjy25zpxkbxn200"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXmu = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { + name = "libXmu-1.1.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2"; + sha256 = "0cdpqnx6258i4l6qhphvkdiyspysg0i5caqjy820kp63wwjk4d4w"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXp = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXau, libXext }: stdenv.mkDerivation { + name = "libXp-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2"; + sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXau libXext ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXpm = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { + name = "libXpm-3.5.13"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2"; + sha256 = "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config gettext ]; + buildInputs = [ libX11 libXext xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXpresent = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + name = "libXpresent-1.0.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2"; + sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXrandr = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation { + name = "libXrandr-1.5.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2"; + sha256 = "08z0mqywrm7ij8bxlfrx0d2wy6kladdmkva1nw5k6qix82z0xsla"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext libXrender ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXrender = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + name = "libXrender-0.9.10"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2"; + sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXres = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + name = "libXres-1.2.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXres-1.2.1.tar.bz2"; + sha256 = "049b7dk6hx47161hg47ryjrm6pwsp27r5pby05b0wqb1pcggprmn"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXt = callPackage + ({ stdenv, pkg-config, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation { + name = "libXt-1.2.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXt-1.2.1.tar.bz2"; + sha256 = "0q1x7842r8rcn2m0q4q9f69h4qa097fyizs8brzx5ns62s7w1737"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libICE xorgproto libSM libX11 ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXtst = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi }: stdenv.mkDerivation { + name = "libXtst-1.2.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2"; + sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext libXi ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXv = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + name = "libXv-1.0.11"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2"; + sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXvMC = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { + name = "libXvMC-1.0.12"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2"; + sha256 = "1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext libXv ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXxf86dga = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + name = "libXxf86dga-1.1.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2"; + sha256 = "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXxf86misc = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + name = "libXxf86misc-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2"; + sha256 = "107k593sx27vjz3v7gbb223add9i7w0bjc90gbb3jqpin3i07758"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libXxf86vm = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + name = "libXxf86vm-1.1.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2"; + sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libdmx = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + name = "libdmx-1.1.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2"; + sha256 = "0hvjfhrcym770cr0zpqajdy3cda30aiwbjzv16iafkqkbl090gr5"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libfontenc = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, zlib }: stdenv.mkDerivation { + name = "libfontenc-1.1.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2"; + sha256 = "0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto zlib ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libpciaccess = callPackage + ({ stdenv, pkg-config, fetchurl, zlib }: stdenv.mkDerivation { + name = "libpciaccess-0.16"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2"; + sha256 = "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ zlib ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libpthreadstubs = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "libpthread-stubs-0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2"; + sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libxcb = callPackage + ({ stdenv, pkg-config, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3 }: stdenv.mkDerivation { + name = "libxcb-1.14"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libxcb-1.14.tar.xz"; + sha256 = "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config python3 ]; + buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libxkbfile = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + name = "libxkbfile-1.1.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2"; + sha256 = "1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + libxshmfence = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + name = "libxshmfence-1.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2"; + sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + listres = callPackage + ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + name = "listres-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/listres-1.0.4.tar.bz2"; + sha256 = "041bxkvv6f92sm3hhm977c4gdqdv5r1jyxjqcqfi8vkrg3s2j4ka"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXaw libXmu xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + lndir = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + name = "lndir-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/util/lndir-1.0.3.tar.bz2"; + sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + luit = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "luit-20190106"; + builder = ./builder.sh; + src = fetchurl { + url = "https://invisible-mirror.net/archives/luit/luit-20190106.tgz"; + sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + makedepend = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + name = "makedepend-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2"; + sha256 = "072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + mkfontscale = callPackage + ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { + name = "mkfontscale-1.2.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2"; + sha256 = "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libfontenc freetype xorgproto zlib ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + oclock = callPackage + ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { + name = "oclock-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/oclock-1.0.4.tar.bz2"; + sha256 = "1zmfzfmdp42nvapf0qz1bc3i3waq5sjrpkgfw64qs4nmq30wy86c"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libxkbfile libX11 libXext libXmu libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + sessreg = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + name = "sessreg-1.1.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2"; + sha256 = "0crczl25zynkrslmm8sjaxszhrh4i33m7h5fg4wfdb3k8aarxjyz"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + setxkbmap = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { + name = "setxkbmap-1.3.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2"; + sha256 = "1xdrxs65v7d0rw1yaz0vsz55w4hxym99216p085ya9978j379wlg"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libxkbfile ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + smproxy = callPackage + ({ stdenv, pkg-config, fetchurl, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation { + name = "smproxy-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2"; + sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libICE libSM libXmu libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + transset = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "transset-1.0.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/transset-1.0.2.tar.bz2"; + sha256 = "088v8p0yfn4r3azabp6662hqikfs2gjb9xmjjd45gnngwwp19b2b"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + twm = callPackage + ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + name = "twm-1.0.10"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/twm-1.0.10.tar.bz2"; + sha256 = "1ms5cj1w3g26zg6bxdv1j9hl0pxr4300qnv003cz1q3cl7ffljb4"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libICE libSM libX11 libXext libXmu xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + utilmacros = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "util-macros-1.19.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2"; + sha256 = "0w8ryfqylprz37zj9grl4jzdsqq67ibfwq5raj7vm1i7kmp2x08g"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + viewres = callPackage + ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, libXt }: stdenv.mkDerivation { + name = "viewres-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/viewres-1.0.5.tar.bz2"; + sha256 = "1mz319kfmvcrdpi22dmdr91mif1j0j3ck1f8mmnz5g1r9kl1in2y"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXaw libXmu libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + x11perf = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation { + name = "x11perf-1.6.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2"; + sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext libXft libXmu xorgproto libXrender ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xauth = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xauth-1.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xauth-1.1.tar.bz2"; + sha256 = "032klzzw8r09z36x1272ssd79bcisz8j5p8gbdy111fiknvx27bd"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXau libXext libXmu xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xbacklight = callPackage + ({ stdenv, pkg-config, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation { + name = "xbacklight-1.2.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2"; + sha256 = "1plssg0s3pbslg6rfzxp9sx8ryvn8l32zyvc8zp9zsbsfwjg69rs"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libxcb xcbutil ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xbitmaps = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "xbitmaps-1.1.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2"; + sha256 = "1vh73sc13s7w5r6gnc6irca56s7998bja7wgdivkfn8jccawgw5r"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcalc = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { + name = "xcalc-1.1.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2"; + sha256 = "1sxmlcb0sb3h4z05kl5l0kxnhrc0h8c74p9m3zdc7bv58jaldmym"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXaw xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcbproto = callPackage + ({ stdenv, pkg-config, fetchurl, python3 }: stdenv.mkDerivation { + name = "xcb-proto-1.14.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz"; + sha256 = "1hzwazgyywd9mz4mjj1yv8ski27qqx7ypmyr27m39hrajyddsjph"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config python3 ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcbutil = callPackage + ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + name = "xcb-util-0.4.0"; + builder = ./builder.sh; + src = fetchurl { + url = "https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2"; + sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config m4 ]; + buildInputs = [ gperf libxcb xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcbutilcursor = callPackage + ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4 }: stdenv.mkDerivation { + name = "xcb-util-cursor-0.1.3"; + builder = ./builder.sh; + src = fetchurl { + url = "https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2"; + sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config m4 ]; + buildInputs = [ gperf libxcb xcbutilimage xcbutilrenderutil xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcbutilerrors = callPackage + ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbproto, xorgproto, m4 }: stdenv.mkDerivation { + name = "xcb-util-errors-1.0"; + builder = ./builder.sh; + src = fetchurl { + url = "https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2"; + sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config m4 ]; + buildInputs = [ gperf libxcb xcbproto xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcbutilimage = callPackage + ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutil, xorgproto, m4 }: stdenv.mkDerivation { + name = "xcb-util-image-0.4.0"; + builder = ./builder.sh; + src = fetchurl { + url = "https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2"; + sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config m4 ]; + buildInputs = [ gperf libxcb xcbutil xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcbutilkeysyms = callPackage + ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + name = "xcb-util-keysyms-0.4.0"; + builder = ./builder.sh; + src = fetchurl { + url = "https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2"; + sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config m4 ]; + buildInputs = [ gperf libxcb xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcbutilrenderutil = callPackage + ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + name = "xcb-util-renderutil-0.3.9"; + builder = ./builder.sh; + src = fetchurl { + url = "https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2"; + sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config m4 ]; + buildInputs = [ gperf libxcb xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcbutilwm = callPackage + ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + name = "xcb-util-wm-0.4.1"; + builder = ./builder.sh; + src = fetchurl { + url = "https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2"; + sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config m4 ]; + buildInputs = [ gperf libxcb xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xclock = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + name = "xclock-1.0.9"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xclock-1.0.9.tar.bz2"; + sha256 = "1fr3q4rszgx7x2zxy2ip592a3fgx20hfwac49p2l5b7jqsr1ying"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xorgproto libXrender libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcmsdb = callPackage + ({ stdenv, pkg-config, fetchurl, libX11 }: stdenv.mkDerivation { + name = "xcmsdb-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2"; + sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcompmgr = callPackage + ({ stdenv, pkg-config, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { + name = "xcompmgr-1.1.8"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2"; + sha256 = "0hvjkanrdlvk3ln5a1jx3c9ggziism2jr1na7jl3zyk0y3sdm28b"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXcomposite libXdamage libXext libXfixes libXrender ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xconsole = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + name = "xconsole-1.0.7"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2"; + sha256 = "1q2ib1626i5da0nda09sp3vzppjrcn82fff83cw7hwr0vy14h56i"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcursorgen = callPackage + ({ stdenv, pkg-config, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { + name = "xcursorgen-1.0.7"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2"; + sha256 = "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libpng libX11 libXcursor ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xcursorthemes = callPackage + ({ stdenv, pkg-config, fetchurl, libXcursor }: stdenv.mkDerivation { + name = "xcursor-themes-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2"; + sha256 = "16a96li0s0ggg60v7f6ywxmsrmxdfizcw55ccv7sp4qjfisca7pf"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXcursor ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xdm = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + name = "xdm-1.1.12"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xdm-1.1.12.tar.bz2"; + sha256 = "1x17hdymf6rd8jmh4n1sd4g5a8ayr5w94nwjw84qs2fs5pvq7lhd"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xdpyinfo = callPackage + ({ stdenv, pkg-config, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xorgproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { + name = "xdpyinfo-1.3.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2"; + sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xorgproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xdriinfo = callPackage + ({ stdenv, pkg-config, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation { + name = "xdriinfo-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2"; + sha256 = "0lcx8h3zd11m4w8wf7dyp89826d437iz78cyrix436bqx31x5k6r"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libGL xorgproto libX11 ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xev = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { + name = "xev-1.2.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xev-1.2.3.tar.bz2"; + sha256 = "02ddsdx138g7szhwklpbzi0cxr34871iay3k28kdcihrz8f4zg36"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto libXrandr ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xeyes = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + name = "xeyes-1.1.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2"; + sha256 = "0lq5j7fryx1wn998jq6h3icz1h6pqrsbs3adskjzjyhn5l6yrg2p"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext libXmu xorgproto libXrender libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86inputevdev = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver }: stdenv.mkDerivation { + name = "xf86-input-evdev-2.10.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2"; + sha256 = "1h1y0fwnawlp4yc5llr1l7hwfcxxpln2fxhy6arcf6w6h4z0f9l7"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libevdev udev mtdev xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86inputjoystick = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-input-joystick-1.6.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2"; + sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86inputkeyboard = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-input-keyboard-1.9.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2"; + sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86inputlibinput = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { + name = "xf86-input-libinput-1.0.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-input-libinput-1.0.1.tar.bz2"; + sha256 = "0nr4r9x8c7y1l0ipivjch5zps093mxmg2nqmfn2934am26fc9ppx"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libinput xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86inputmouse = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-input-mouse-1.9.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2"; + sha256 = "1iawr1wyl2qch1mqszcs0s84i92mh4xxprflnycbw1adc18b7v4k"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86inputsynaptics = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { + name = "xf86-input-synaptics-1.9.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2"; + sha256 = "0xhm03qywwfgkpfl904d08lx00y28m1b6lqmks5nxizixwk3by3s"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libevdev libX11 libXi xorgserver libXtst ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86inputvmmouse = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { + name = "xf86-input-vmmouse-13.1.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2"; + sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto udev xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86inputvoid = callPackage + ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { + name = "xf86-input-void-1.4.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2"; + sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgserver xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoamdgpu = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-amdgpu-19.1.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-amdgpu-19.1.0.tar.bz2"; + sha256 = "0pgy4ihnja0vm8504qw7qxh3pdpa3p9k6967nz15m6b1mvha83jg"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto mesa libGL libdrm udev xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoapm = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-apm-1.3.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2"; + sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoark = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-ark-0.7.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2"; + sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoast = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-ast-1.1.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2"; + sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoati = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-ati-19.1.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-ati-19.1.0.tar.bz2"; + sha256 = "0j9w4axsqlycv4v14g53xyhkm9h7d27b2fcv9lrzb9gf54b5m7v5"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto mesa libGL libdrm udev libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videochips = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-chips-1.4.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2"; + sha256 = "1gqzy7q9v824m7hqkbbmncxg082zm0d4mafgc97c4skyiwgf9wq7"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videocirrus = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-cirrus-1.5.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2"; + sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videodummy = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-dummy-0.3.8"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2"; + sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videofbdev = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-fbdev-0.5.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2"; + sha256 = "16a66zr0l1lmssa07i3rzy07djxnb45c17ks8c71h8l06xgxihyw"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videogeode = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-geode-2.11.19"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-geode-2.11.19.tar.bz2"; + sha256 = "0zn9gb49grds5mcs1dlrx241k2w1sgqmx4i5x7v6159xxqhlqsf6"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoglide = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-glide-1.2.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2"; + sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoglint = callPackage + ({ stdenv, pkg-config, fetchurl, libpciaccess, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-glint-1.2.9"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2"; + sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libpciaccess xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoi128 = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-i128-1.4.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2"; + sha256 = "1snhpv1igrhifcls3r498kjd14ml6x2xvih7zk9xlsd1ymmhlb4g"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoi740 = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-i740-1.4.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2"; + sha256 = "0l3s1m95bdsg4gki943qipq8agswbb84dzcflpxa3vlckwhh3r26"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videointel = callPackage + ({ stdenv, pkg-config, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { + name = "xf86-video-intel-2.99.917"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2"; + sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videomach64 = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-mach64-6.9.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2"; + sha256 = "171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videomga = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-mga-2.0.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2"; + sha256 = "0yaxpgyyj9398nzzr5vnsfxcis76z46p9814yzj8179yl7hld296"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoneomagic = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-neomagic-1.3.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2"; + sha256 = "0r4h673kw8fl7afc30anwbjlbhp82mg15fvaxf470xg7z983k0wk"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videonewport = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-newport-0.2.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2"; + sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videonouveau = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-nouveau-1.0.17"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.17.tar.bz2"; + sha256 = "0sqm1jwjg15sp8v7039y2hsbhph8gpjd2bdzcqqiij2mgbi254s9"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videonv = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-nv-2.1.21"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2"; + sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoomap = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-omap-0.4.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2"; + sha256 = "0nmbrx6913dc724y8wj2p6vqfbj5zdjfmsl037v627jj0whx9rwk"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoopenchrome = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver, libXvMC }: stdenv.mkDerivation { + name = "xf86-video-openchrome-0.6.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2"; + sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver libXvMC ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoqxl = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-qxl-0.1.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2"; + sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videor128 = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-r128-6.11.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2"; + sha256 = "0snvwmrh8dqyyaq7ggicym6yrsg4brygkx9156r0m095m7fp3rav"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videorendition = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-rendition-4.2.7"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2"; + sha256 = "0yzqcdfrnnyaaaa76d4hpwycpq4x2j8qvg9m4q19lj4xbicwc4cm"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videos3virge = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-s3virge-1.11.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2"; + sha256 = "06d1v5s7xf00y18x12cz11sk00rgn0yq95w66kmgzy465pzxvj84"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videosavage = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-savage-2.3.9"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2"; + sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videosiliconmotion = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-siliconmotion-1.7.9"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2"; + sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videosis = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-sis-0.11.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2"; + sha256 = "0srvrhydjnynfb7b1s145rgmsk4f71iz0ag4icpmb05944d90xr1"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videosisusb = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-sisusb-0.9.7"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2"; + sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videosuncg6 = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-suncg6-1.1.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2"; + sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videosunffb = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-sunffb-1.2.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2"; + sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videosunleo = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-sunleo-1.2.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2"; + sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videotdfx = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-tdfx-1.5.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2"; + sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videotga = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-tga-1.2.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2"; + sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videotrident = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-trident-1.3.8"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2"; + sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videov4l = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-v4l-0.3.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2"; + sha256 = "084x4p4avy72mgm2vnnvkicw3419i6pp3wxik8zqh7gmq4xv5z75"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videovboxvideo = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-vboxvideo-1.0.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2"; + sha256 = "195z1js3i51qgxvhfw4bxb4dw3jcrrx2ynpm2y3475dypjzs7dkz"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videovesa = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-vesa-2.5.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-vesa-2.5.0.tar.bz2"; + sha256 = "0nf6ai74c60xk96kgr8q9mx6lrxm5id3765ws4d801irqzrj85hz"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videovmware = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-vmware-13.3.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2"; + sha256 = "0v06qhm059klq40m2yx4wypzb7h53aaassbjfmm6clcyclj1k5s7"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videovoodoo = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-voodoo-1.2.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2"; + sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videowsfb = callPackage + ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { + name = "xf86-video-wsfb-0.4.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2"; + sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgserver xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xf86videoxgi = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-xgi-1.6.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2"; + sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xfd = callPackage + ({ stdenv, pkg-config, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation { + name = "xfd-1.1.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xfd-1.1.3.tar.bz2"; + sha256 = "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config gettext ]; + buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xfontsel = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { + name = "xfontsel-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2"; + sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXaw libXmu libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xfs = callPackage + ({ stdenv, pkg-config, fetchurl, libXfont2, xorgproto, xtrans }: stdenv.mkDerivation { + name = "xfs-1.2.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xfs-1.2.0.tar.bz2"; + sha256 = "0q4q4rbzx159sfn2n52y039fki6nc6a39qdfxa78yjc3aw8i48nv"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXfont2 xorgproto xtrans ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xfsinfo = callPackage + ({ stdenv, pkg-config, fetchurl, libFS, xorgproto }: stdenv.mkDerivation { + name = "xfsinfo-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2"; + sha256 = "1mmir5i7gm71xc0ba8vnizi4744vsd31hknhi4cmgvg6kadqngla"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libFS xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xgamma = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { + name = "xgamma-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2"; + sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto libXxf86vm ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xgc = callPackage + ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + name = "xgc-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xgc-1.0.5.tar.bz2"; + sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXaw libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xhost = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xhost-1.0.8"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xhost-1.0.8.tar.bz2"; + sha256 = "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXau libXmu xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xinit = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "xinit-1.4.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xinit-1.4.1.tar.bz2"; + sha256 = "1fdbakx59vyh474skjydj1bbglpby3y03nl7mxn0z9v8gdhqz6yy"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xinput = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { + name = "xinput-1.6.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xinput-1.6.3.tar.bz2"; + sha256 = "1vb6xdd1xmk5f7pwc5zcbxfray5sf1vbnscqwf2yl8lv7gfq38im"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXext libXi libXinerama libXrandr ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xkbcomp = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { + name = "xkbcomp-1.4.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xkbcomp-1.4.5.tar.bz2"; + sha256 = "0pmhshqinwqh5rip670l3szjpywky67hv232ql6gvdj489n0hlb8"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libxkbfile xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xkbevd = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { + name = "xkbevd-1.1.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2"; + sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libxkbfile ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xkbprint = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { + name = "xkbprint-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2"; + sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libxkbfile xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xkbutils = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXaw, libXt }: stdenv.mkDerivation { + name = "xkbutils-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2"; + sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto libX11 libXaw libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xkeyboardconfig = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, python3 }: stdenv.mkDerivation { + name = "xkeyboard-config-2.31"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.31.tar.bz2"; + sha256 = "18xddaxh83zm698syh50w983jg6b7b8zgv0dfaf7ha485hgihi6s"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config python3 ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xkill = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xkill-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xkill-1.0.5.tar.bz2"; + sha256 = "0szzd9nzn0ybkhnfyizb876irwnjsnb78rcaxx6prb71jmmbpw65"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXmu xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xload = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation { + name = "xload-1.1.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xload-1.1.3.tar.bz2"; + sha256 = "01sr6yd6yhyyfgn88l867w6h9dn5ikcynaz5rwji6xqxhw1lhkpk"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config gettext ]; + buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xlsatoms = callPackage + ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { + name = "xlsatoms-1.1.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2"; + sha256 = "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libxcb ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xlsclients = callPackage + ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { + name = "xlsclients-1.1.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2"; + sha256 = "1h8931sn34mcip6vpi4v7hdmr1r58gkbw4s2p97w98kykks2lgvp"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libxcb ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xlsfonts = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "xlsfonts-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2"; + sha256 = "0s6kxgv78chkwsqmhw929f4pf91gq63f4yvixxnan1h00cx0pf49"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xmag = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { + name = "xmag-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xmag-1.0.6.tar.bz2"; + sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXaw libXmu libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xmessage = callPackage + ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + name = "xmessage-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2"; + sha256 = "0a90kfm0qz8cn2pbpqfyqrc5s9bfvvy14nj848ynvw56wy0zng9p"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXaw libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xmodmap = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "xmodmap-1.0.10"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2"; + sha256 = "0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xmore = callPackage + ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + name = "xmore-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xmore-1.0.3.tar.bz2"; + sha256 = "06r514p30v87vx00ddlck9mwazaqk9bx08ip866p1mw2a46iwjk4"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXaw libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xorgcffiles = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "xorg-cf-files-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2"; + sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xorgdocs = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "xorg-docs-1.7.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2"; + sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xorgproto = callPackage + ({ stdenv, pkg-config, fetchurl, libXt }: stdenv.mkDerivation { + name = "xorgproto-2021.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/proto/xorgproto-2021.3.tar.bz2"; + sha256 = "0dypp7cvjf0rvwa7cn1zp7djw5ynhs1rwk9p0r1vczbwzha2nwsc"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xorgserver = callPackage + ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { + name = "xorg-server-1.20.11"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/xserver/xorg-server-1.20.11.tar.bz2"; + sha256 = "0jacqgin8kcyy8fyv0lhgb4if8g9hp60rm3ih3s1mgps7xp7jk4i"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorgproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xorgsgmldoctools = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "xorg-sgml-doctools-1.11"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2"; + sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xpr = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xpr-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xpr-1.0.5.tar.bz2"; + sha256 = "07qy9lwjvxighcmg6qvjkgagad3wwvidrfx0jz85lgynz3qy0dmr"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXmu xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xprop = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "xprop-1.2.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xprop-1.2.5.tar.bz2"; + sha256 = "18ckr8g1z50zkc01hprkpm1npwbq32yqib4b3l98c95z2q1yv4lv"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xrandr = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr, libXrender }: stdenv.mkDerivation { + name = "xrandr-1.5.1"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xrandr-1.5.1.tar.xz"; + sha256 = "0ql75s1n3dm2m3g1ilb9l6hqh15r0v709bgghpwazy3jknpnvivv"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto libXrandr libXrender ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xrdb = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xrdb-1.2.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2"; + sha256 = "0ik9gh6363c47pr0dp7q22nfs8vmavjg2v4bsr0604ppl77nafpj"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXmu xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xrefresh = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "xrefresh-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2"; + sha256 = "0lv3rlshh7s0z3aqx5ahnnf8cl082m934bk7gv881mz8nydznz98"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xset = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc }: stdenv.mkDerivation { + name = "xset-1.2.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xset-1.2.4.tar.bz2"; + sha256 = "0my987wjvra7l92ry6q44ky383yg3phzxhdbn3lqhapm1ll9bzg4"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXext libXmu xorgproto libXxf86misc ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xsetroot = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xbitmaps, libXcursor, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xsetroot-1.1.2"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2"; + sha256 = "0z21mqvmdl6rl63q77479wgkfygnll57liza1i3va7sr4fx45i0h"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xbitmaps libXcursor libXmu xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xsm = callPackage + ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, libXt }: stdenv.mkDerivation { + name = "xsm-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xsm-1.0.4.tar.bz2"; + sha256 = "09a4ss1fnrh1sgm21r4n5pivawf34paci3rn6mscyljf7a4vcd4r"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libICE libSM libX11 libXaw libXt ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xstdcmap = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xstdcmap-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2"; + sha256 = "12vgzsxv4rw25frkgjyli6w6hy10lgpvsx9wzw2v5l5a3qzqp286"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXmu xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xtrans = callPackage + ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + name = "xtrans-1.4.0"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2"; + sha256 = "0wyp0yc6gi72hwc3kjmvm3vkj9p6s407cb6dxx37jh9wb68l8z1p"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xtrap = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libXt, libXTrap }: stdenv.mkDerivation { + name = "xtrap-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2"; + sha256 = "0sqm4j1zflk1s94iq4waa70hna1xcys88v9a70w0vdw66czhvj2j"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXt libXTrap ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xvinfo = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { + name = "xvinfo-1.1.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2"; + sha256 = "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto libXv ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xwd = callPackage + ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { + name = "xwd-1.0.7"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xwd-1.0.7.tar.bz2"; + sha256 = "1537i8q8pgf0sjklakzfvjwrq5b246qjywrx9ll8xfg0p6w1as6d"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libxkbfile libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xwininfo = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, libxcb, xorgproto }: stdenv.mkDerivation { + name = "xwininfo-1.1.4"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2"; + sha256 = "00avrpw4h5mr1klp41lv2j4dmq465v6l5kb5bhm4k5ml8sm9i543"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libxcb xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; + + # THIS IS A GENERATED FILE. DO NOT EDIT! + xwud = callPackage + ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + name = "xwud-1.0.5"; + builder = ./builder.sh; + src = fetchurl { + url = "mirror://xorg/individual/app/xwud-1.0.5.tar.bz2"; + sha256 = "1a8hdgy40smvblnh3s9f0vkqckl68nmivx7d48zk34m8z18p16cr"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 xorgproto ]; + meta.platforms = lib.platforms.unix; + }) + { }; }) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 1e6b9888ba2..1d11bfb3a35 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -54,6 +54,10 @@ self: super: ''; }); + fonttosfnt = super.fonttosfnt.overrideAttrs (attrs: { + meta = attrs.meta // { license = lib.licenses.mit; }; + }); + imake = super.imake.overrideAttrs (attrs: { inherit (self) xorgcffiles; x11BuildHook = ./imake.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 139dd60eb3f..e9249180358 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -11,7 +11,7 @@ mirror://xorg/individual/app/appres-1.0.5.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.9.tar.gz mirror://xorg/individual/app/editres-1.0.7.tar.bz2 -mirror://xorg/individual/app/fonttosfnt-1.2.1.tar.bz2 +mirror://xorg/individual/app/fonttosfnt-1.2.2.tar.bz2 mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 mirror://xorg/individual/app/ico-1.0.5.tar.bz2 mirror://xorg/individual/app/listres-1.0.4.tar.bz2 diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/shells/hilbish/default.nix index e0449ce24c2..2ffd10e3a6a 100644 --- a/pkgs/shells/hilbish/default.nix +++ b/pkgs/shells/hilbish/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "hilbish"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { - owner = "Hilbis"; + owner = "Rosettea"; repo = "Hilbish"; rev = "v${version}"; - sha256 = "sha256-7YJkjkA6lGyO4PwJcdeUzqQvFsslDfIqAH6vlBtyYz8="; + sha256 = "sha256-cYpGTk0adT3X/elrJW2Wjv4SbPvgeyYmsOHTrft8678="; }; - vendorSha256 = "sha256-9FftzTn5nxjfsHStcnrn9a+sECmcHRBUEtFjsMp8/ks="; + vendorSha256 = "sha256-8l+Kb1ADMLwv0Hf/ikok8eUcEEST07rhk8BjHxJI0lc="; buildInputs = [ readline ]; meta = with lib; { description = "An interactive Unix-like shell written in Go"; - changelog = "https://github.com/Hilbis/Hilbish/releases/tag/v${version}"; - homepage = "https://github.com/Hilbis/Hilbish"; + changelog = "https://github.com/Rosettea/Hilbish/releases/tag/v${version}"; + homepage = "https://github.com/Rosettea/Hilbish"; maintainers = with maintainers; [ fortuneteller2k ]; license = licenses.mit; platforms = platforms.linux; # only officially supported on Linux diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index ea0caf02055..7c75e34f019 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -145,7 +145,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { sshtunnel urllib3 vsts-cd-manager - websocket_client + websocket-client xmltodict javaproperties jsondiff diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 6dc575c6b60..228fb4503cf 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -499,11 +499,10 @@ let }; }); - websocket_client = super.websocket_client.overridePythonAttrs(oldAttrs: rec { + websocket-client = super.websocket-client.overridePythonAttrs(oldAttrs: rec { version = "0.56.0"; - src = super.fetchPypi { - inherit (oldAttrs) pname; + src = oldAttrs.src.override { inherit version; sha256 = "0fpxjyr74klnyis3yf6m54askl0h5dchxcwbfjsq92xng0455m8z"; }; diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index 6cfa77c8cec..12db00af0dd 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/naelstrof/maim/releases/tag/v${version}"; platforms = lib.platforms.all; license = lib.licenses.gpl3Plus; - maintainers = with maintainers; [ primeos mbakke ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/g203-led/default.nix b/pkgs/tools/misc/g203-led/default.nix new file mode 100644 index 00000000000..7290b57a323 --- /dev/null +++ b/pkgs/tools/misc/g203-led/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv +, fetchFromGitHub +, python3 +}: +stdenv.mkDerivation rec { + pname = "g203-led"; + version = "unstable-2021-05-08"; + src = fetchFromGitHub { + owner = "smasty"; + repo = pname; + rev = "f9d10ba3aa8f9359f928bbab0a2ea00cefc69f4b"; + sha256 = "1fhaimci80xmihg84bgrml61zr56pi9rkxfbs13vvw9dwjf031k0"; + }; + + buildInputs = [ + (python3.withPackages (ps: with ps; [ + pyusb + ])) + ]; + + postPatch = '' + patchShebangs g203-led.py + ''; + + installPhase = '' + runHook preInstall + install -D g203-led.py $out/bin/g203-led + runHook postInstall + ''; + + meta = with lib; { + description = "Logitech G203 Prodigy / G203 LightSync Mouse LED control for Linux"; + longDescription = '' + Allows you to control the LED lighting of your G203 Prodigy + or G203 LightSync Mouse programmatically. + Inspired by and based on g810-led. + ''; + license = licenses.mit; + maintainers = with maintainers; [ r-burns ]; + homepage = "https://github.com/smasty/g203-led"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index a4a65e37e4e..a73dd8d3cbe 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "Queries a selection from the user and prints to stdout"; platforms = lib.platforms.linux; license = lib.licenses.gpl3Plus; - maintainers = with maintainers; [ primeos mbakke ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/vsh/default.nix b/pkgs/tools/misc/vsh/default.nix index a94c58368a4..13a3df4d6b9 100644 --- a/pkgs/tools/misc/vsh/default.nix +++ b/pkgs/tools/misc/vsh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vsh"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "fishi0x01"; repo = "vsh"; rev = "v${version}"; - sha256 = "0dhn2aqd52fgasy4j3ar67fzwzcxfi1vl09kni8jwcna8rjgg3fj"; + sha256 = "059zzsg94287sxlk5clz6in7jscqaq530c84xqgy537f6cq3vr2p"; }; # vendor directory is part of repository diff --git a/pkgs/tools/misc/yafetch/default.nix b/pkgs/tools/misc/yafetch/default.nix index c3bea1d9e8c..8dad93d0deb 100644 --- a/pkgs/tools/misc/yafetch/default.nix +++ b/pkgs/tools/misc/yafetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yafetch"; - version = "unstable-2021-06-01"; + version = "unstable-2021-06-15"; src = fetchFromGitLab { owner = "cyberkitty"; repo = pname; - rev = "d9bbc1e4abca87028f898473c9a265161af3c287"; - sha256 = "0hyb5k7drnm9li720z1fdvz7b15xgf7n6yajnz1j98day3k88bqk"; + rev = "423a7d1f1ef8f0e4caf586710828620d3cb593e3"; + sha256 = "184yy7i8ca2fh6d1rxyhxi9gqb57fpz7ia0i56dl1zhg769m8b99"; }; # Use the provided NixOS logo automatically @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/cyberkitty/yafetch"; description = "Yet another fetch clone written in C++"; license = licenses.gpl2Only; - maintainers = [ maintainers.ivar ]; + maintainers = with maintainers; [ ivar ashley ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index 30b9c496900..a28cf27ab1a 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.7.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "sha256-yunKyCjJ/vWUcsodweLmxv0+QJQI2i5u5VIzp2U+VyU="; + sha256 = "sha256-M83J28aG4NACBZtCJzYNU7aYNTJILAboaDv5aAo35OM="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,10 +28,14 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "sha256-eoal6z4wX1pNdAJfdamJgOSFCvGWdbVlq1X+vD9lraE="; + cargoSha256 = "sha256-aF0vdudOFBcDrHpgsS7+HNE70GTNPdBOmbvQhLwmsM0="; postInstall = '' installManPage man/* + installShellCompletion --cmd zoxide \ + --bash contrib/completions/zoxide.bash \ + --fish contrib/completions/zoxide.fish \ + --zsh contrib/completions/_zoxide ''; meta = with lib; { diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix index f40ef295d13..744fd482ab1 100644 --- a/pkgs/tools/networking/dd-agent/5.nix +++ b/pkgs/tools/networking/dd-agent/5.nix @@ -17,7 +17,7 @@ let propagatedBuildInputs = with self; [ six requests - websocket_client + websocket-client ipaddress docker_pycreds uptime diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 1c9e8149232..eaaf7046fff 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -79,7 +79,7 @@ in with localPython.pkgs; buildPythonApplication rec { # Otherwise, awsebcli will try to install it using pip when using some # commands (like "eb local run"). blessed botocore cement colorama dockerpty docopt pathspec pyyaml - requests semantic-version setuptools tabulate termcolor websocket_client + requests semantic-version setuptools tabulate termcolor websocket-client ]; postInstall = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4a2fed5270b..eedf4fc75ef 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -817,6 +817,11 @@ mapAliases ({ telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 telepathy_salut = telepathy-salut; # added 2018-02-25 telnet = inetutils; # added 2018-05-15 + terraform_1_0_0 = terraform_1_0; # added 2021-06-15 + terraform_0_12 = throw "terraform 0.12 has been removed"; # added 2021-06-15 + terraform_0_13 = throw "terraform 0.13 has been removed"; # added 2021-06-15 + terraform_0_14 = throw "terraform 0.14 has been removed"; # added 2021-06-15 + terraform_0_15 = throw "terraform 0.15 has been removed"; # added 2021-06-15 terraform-provider-ibm = terraform-providers.ibm; # added 2018-09-28 terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28 terraform-provider-lxd = terraform-providers.lxd; # added 2020-03-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f66632ac179..b813443e70f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4779,6 +4779,8 @@ in flips = callPackage ../tools/compression/flips { }; + flowblade = callPackage ../applications/video/flowblade { }; + fmbt = callPackage ../development/tools/fmbt { python = python2; }; @@ -10648,6 +10650,8 @@ in fpc = callPackage ../development/compilers/fpc { }; + g203-led = callPackage ../tools/misc/g203-led { }; + gambit = callPackage ../development/compilers/gambit { }; gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; gambit-support = callPackage ../development/compilers/gambit/gambit-support.nix { }; @@ -17911,6 +17915,8 @@ in randomx = callPackage ../development/libraries/randomx { }; + retro-gtk = callPackage ../development/libraries/retro-gtk { }; + resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino { @@ -20421,6 +20427,7 @@ in iomelt = callPackage ../os-specific/linux/iomelt { }; iotop = callPackage ../os-specific/linux/iotop { }; + iotop-c = callPackage ../os-specific/linux/iotop-c { }; iproute2 = callPackage ../os-specific/linux/iproute { }; @@ -23403,6 +23410,7 @@ in acl = null; gpm = null; inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; + inherit (darwin) sigtool; }; emacs27-nox = lowPrio (appendToName "nox" (emacs27.override { @@ -31140,6 +31148,9 @@ in mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { }; mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { }; + mfc9140cdncupswrapper = callPackage ../misc/cups/drivers/mfc9140cdncupswrapper { }; + mfc9140cdnlpr = callPackage ../misc/cups/drivers/mfc9140cdnlpr { }; + samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36/default.nix { }; samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { }; samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; @@ -31240,15 +31251,12 @@ in termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; inherit (callPackage ../applications/networking/cluster/terraform { }) - terraform_0_12 - terraform_0_13 - terraform_0_14 - terraform_0_15 - terraform_1_0_0 + mkTerraform + terraform_1_0 terraform_plugins_test ; - terraform = terraform_0_12; + terraform = terraform_1_0; # deprecated terraform-full = terraform.full; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 4dc848c08c6..6a189c0005a 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -14,12 +14,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { # BINARY PACKAGES - Autofac = fetchNuGet { - baseName = "Autofac"; - version = "3.5.2"; - sha256 = "194cs8ybn5xjqnzy643w5i62m0d5s34d3nshwxp2v4fcb94wa4ri"; - outputFiles = [ "lib/portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1/*" ]; - }; NUnit3 = fetchNuGet { baseName = "NUnit"; @@ -28,13 +22,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/*" ]; }; - NUnit350 = fetchNuGet { - baseName = "NUnit"; - version = "3.5.0"; - sha256 = "19fxq9cf754ygda5c8rn1zqs71pfxi7mb96jwqhlichnqih6i16z"; - outputFiles = [ "*" ]; - }; - NUnit2 = fetchNuGet { baseName = "NUnit"; version = "2.6.4"; @@ -86,13 +73,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "tools/*" ]; }; - SystemValueTuple = fetchNuGet { - baseName = "System.ValueTuple"; - version = "4.3.1"; - sha256 = "0qzq878s66yfkf4n2b9af8lw2bx45s3cg6mi0w8w0bi358fa7q70"; - outputFiles = [ "*" ]; - }; - RestSharp = fetchNuGet { baseName = "RestSharp"; version = "105.2.3"; @@ -135,20 +115,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/*" ]; }; - MicrosoftDiaSymReader = fetchNuGet { - baseName = "Microsoft.DiaSymReader"; - version = "1.1.0"; - sha256 = "04dgwy6nyxksd1nb24k5c5vz8naggg7hryadvwqnm2v3alkh6g88"; - outputFiles = [ "*" ]; - }; - - MicrosoftDiaSymReaderPortablePdb = fetchNuGet { - baseName = "Microsoft.DiaSymReader.PortablePdb"; - version = "1.2.0"; - sha256 = "0qa8sqg0lzz9galkkfyi8rkbkali0nxm3qd5y4dlxp96ngrq5ldz"; - outputFiles = [ "*" ]; - }; - NUnitRunners = fetchNuGet { baseName = "NUnit.Runners"; version = "2.6.4"; @@ -157,26 +123,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { preInstall = "mv -v tools/lib/* tools && rmdir -v tools/lib"; }; - SystemCollectionsImmutable = fetchNuGet { - baseName = "System.Collections.Immutable"; - version = "1.1.36"; - sha256 = "0760kzf5s771pnvnxsgas446kqdh1b71w6g3k75jpzldfmsd3vyq"; - outputFiles = [ "lib/portable-net45+win8+wp8+wpa81/*" ]; - }; - - SystemCollectionsImmutable131 = fetchNuGet { - baseName = "System.Collections.Immutable"; - version = "1.3.1"; - sha256 = "149fcp7k7r9iw24dv5hbaij0c38kcv28dyhzbkggilfh4x2hy8c2"; - outputFiles = [ "*" ]; - }; - - SystemReflectionMetadata = fetchNuGet { - baseName = "System.Reflection.Metadata"; - version = "1.4.2"; - sha256 = "19fhdgd35yg52gyckhgwrphq07nv7v7r73hcg69ns94xfg1i6r7i"; - outputFiles = [ "*" ]; - }; # SOURCE PACKAGES Boogie = buildDotnetPackage rec { @@ -300,91 +246,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - Deedle = fetchNuGet { - baseName = "Deedle"; - version = "1.2.5"; - sha256 = "0g19ll6bp97ixprcnpwwvshr1n9jxxf9xjhkxp0r63mg46z48jnw"; - outputFiles = [ "*" ]; - }; - - ExcelDna = buildDotnetPackage { - baseName = "Excel-DNA"; - version = "0.32.0"; - - src = fetchFromGitHub { - owner = "Excel-DNA"; - repo = "ExcelDna"; - rev = "10a163843bcc2fb5517f6f3d499e18a8b64df511"; - sha256 = "1w2ag9na20ly0m2sic3nkgdc4qqyb4x4c9iv588ynpkgd1pjndrk"; - }; - - buildInputs = [ ]; - - preConfigure = '' - rm -vf Distribution/*.dll Distribution/*.exe # Make sure we don't use those - substituteInPlace Source/ExcelDna.Integration/ExcelDna.Integration.csproj --replace LogDisplay.designer.cs LogDisplay.Designer.cs - ''; - - xBuildFiles = [ "Source/ExcelDna.sln" ]; - outputFiles = [ "Source/ExcelDnaPack/bin/Release/*" "Distribution/ExcelDna.xll" "Distribution/ExcelDna64.xll" ]; - - meta = { - description = "Excel-DNA is an independent project to integrate .NET into Excel"; - homepage = "https://excel-dna.net/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ obadz ]; - platforms = with lib.platforms; linux; - }; - }; - - GitVersionTree = buildDotnetPackage { - baseName = "GitVersionTree"; - version = "2013-10-01"; - - src = fetchFromGitHub { - owner = "crc8"; - repo = "GitVersionTree"; - rev = "58dc39c43cffea44f721ee4425835e56518f7da2"; - sha256 = "0mna5pkpqkdr5jgn8paz004h1pa24ncsvmi2c8s4gp94nfw34x05"; - }; - - buildInputs = with pkgs; [ ed ]; - - postPatch = '' - ed -v -p: -s GitVersionTree/Program.cs << EOF - /Main() - c - static void Main(string[] args) - . - /EnableVisualStyles - i - Reg.Write("GitPath", "${pkgs.gitMinimal}/bin/git"); - Reg.Write("GraphvizPath", "${pkgs.graphviz}/bin/dot"); - if (args.Length > 0) { - Reg.Write("GitRepositoryPath", args[0]); - } - . - w - EOF - - substituteInPlace GitVersionTree/Forms/MainForm.cs \ - --replace 'Directory.GetParent(Application.ExecutablePath)' 'Environment.CurrentDirectory' \ - --replace '\\' '/' \ - --replace '@"\"' '"/"' - ''; - - outputFiles = [ "GitVersionTree/bin/Release/*" ]; - exeFiles = [ "GitVersionTree.exe" ]; - - meta = with lib; { - description = "A tool to help visualize git revisions and branches"; - homepage = "https://github.com/crc8/GitVersionTree"; - license = licenses.gpl2; - maintainers = with maintainers; [ obadz ]; - platforms = platforms.all; - }; - }; - MonoAddins = buildDotnetPackage rec { baseName = "Mono.Addins"; version = "1.2"; @@ -417,38 +278,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - - NDeskOptions = stdenv.mkDerivation rec { - pname = "NDesk.Options"; - version = "0.2.1"; - - src = fetchurl { - name = "${pname}-${version}.tar.gz"; - url = "http://www.ndesk.org/archive/ndesk-options/ndesk-options-${version}.tar.gz"; - sha256 = "1y25bfapafwmifakjzyb9c70qqpvza8g5j2jpf08j8wwzkrb6r28"; - }; - - buildInputs = [ - mono - pkg-config - ]; - - postInstall = '' - # Otherwise pkg-config won't find it and the DLL will get duplicated - ln -sv $out/lib/pkgconfig/ndesk-options.pc $out/lib/pkgconfig/NDesk.Options.pc - ''; - - dontStrip = true; - - meta = { - description = "A callback-based program option parser for C#"; - homepage = "http://www.ndesk.org/Options"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ obadz ]; - platforms = with lib.platforms; linux; - }; - }; - NewtonsoftJson = fetchNuGet { baseName = "Newtonsoft.Json"; version = "11.0.2"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 330c29269db..8b5298059f1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13803,12 +13803,12 @@ let MojoliciousPluginWebpack = buildPerlPackage { pname = "Mojolicious-Plugin-Webpack"; - version = "0.14"; + version = "1.01"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Webpack-0.14.tar.gz"; - sha256 = "0b1a9rm5rlpqj6skgic4qzy4b1p35r2dhkh3rwaaypf9ha70i9gc"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Webpack-1.01.tar.gz"; + sha256 = "1w6dr7yb8lvvx5z2xsmshp2cf4b7dynv05yhq0rk7zwif5v6gsvm"; }; - propagatedBuildInputs = [ Mojolicious ]; + propagatedBuildInputs = [ Mojolicious Filechdir ]; meta = { homepage = "https://github.com/jhthorsen/mojolicious-plugin-webpack"; description = "Mojolicious <3 Webpack"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4a19d69d562..15e09c0f7bb 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -52,4 +52,5 @@ mapAliases ({ smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 + websocket_client = websocket-client; }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1839e598a15..865c6aa8fcb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -725,6 +725,8 @@ in { azure-eventgrid = callPackage ../development/python-modules/azure-eventgrid { }; + azure-eventhub = callPackage ../development/python-modules/azure-eventhub { }; + azure-functions-devops-build = callPackage ../development/python-modules/azure-functions-devops-build { }; azure-graphrbac = callPackage ../development/python-modules/azure-graphrbac { }; @@ -1099,6 +1101,8 @@ in { bleak = callPackage ../development/python-modules/bleak { }; + blebox-uniapi = callPackage ../development/python-modules/blebox-uniapi { }; + blessed = callPackage ../development/python-modules/blessed { }; blessings = callPackage ../development/python-modules/blessings { }; @@ -1133,6 +1137,8 @@ in { boltztrap2 = callPackage ../development/python-modules/boltztrap2 { }; + bond-api = callPackage ../development/python-modules/bond-api { }; + booleanoperations = callPackage ../development/python-modules/booleanoperations { }; boolean-py = callPackage ../development/python-modules/boolean-py { }; @@ -1146,6 +1152,10 @@ in { boschshcpy = callPackage ../development/python-modules/boschshcpy { }; + boost-histogram = callPackage ../development/python-modules/boost-histogram { + inherit (pkgs) boost; + }; + boto3 = callPackage ../development/python-modules/boto3 { }; boto = callPackage ../development/python-modules/boto { }; @@ -2626,6 +2636,8 @@ in { fonttools = callPackage ../development/python-modules/fonttools { }; + foobot-async = callPackage ../development/python-modules/foobot-async { }; + foolscap = callPackage ../development/python-modules/foolscap { }; forbiddenfruit = callPackage ../development/python-modules/forbiddenfruit { }; @@ -3015,6 +3027,8 @@ in { graphql-server-core = callPackage ../development/python-modules/graphql-server-core { }; + graphql-subscription-manager = callPackage ../development/python-modules/graphql-subscription-manager { }; + graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { }; graphtage = callPackage ../development/python-modules/graphtage { }; @@ -3029,6 +3043,8 @@ in { greatfet = callPackage ../development/python-modules/greatfet { }; + greeclimate = callPackage ../development/python-modules/greeclimate { }; + green = callPackage ../development/python-modules/green { }; greenlet = callPackage ../development/python-modules/greenlet { }; @@ -4373,6 +4389,11 @@ in { mlxtend = callPackage ../development/python-modules/mlxtend { }; + mlt = toPythonModule (pkgs.mlt.override { + inherit python; + enablePython = true; + }); + mmh3 = callPackage ../development/python-modules/mmh3 { }; mmpython = callPackage ../development/python-modules/mmpython { }; @@ -5197,6 +5218,10 @@ in { pyatag = callPackage ../development/python-modules/pyatag { }; + pyfireservicerota = callPackage ../development/python-modules/pyfireservicerota { }; + + pyflick = callPackage ../development/python-modules/pyflick { }; + pynndescent = callPackage ../development/python-modules/pynndescent { }; pynobo = callPackage ../development/python-modules/pynobo { }; @@ -6964,6 +6989,8 @@ in { pyeverlights = callPackage ../development/python-modules/pyeverlights { }; + pytibber = callPackage ../development/python-modules/pytibber { }; + pytile = callPackage ../development/python-modules/pytile { }; pytimeparse = callPackage ../development/python-modules/pytimeparse { }; @@ -8881,6 +8908,8 @@ in { wakeonlan = callPackage ../development/python-modules/wakeonlan { }; + wallbox = callPackage ../development/python-modules/wallbox { }; + Wand = callPackage ../development/python-modules/Wand { }; warlock = callPackage ../development/python-modules/warlock { }; @@ -8935,7 +8964,7 @@ in { webrtcvad = callPackage ../development/python-modules/webrtcvad { }; - websocket_client = callPackage ../development/python-modules/websocket_client { }; + websocket-client = callPackage ../development/python-modules/websocket-client { }; websockets = callPackage ../development/python-modules/websockets { }; |