diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d75b03aed00..7a23ed1a4cd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2381,6 +2381,12 @@ github = "delan"; githubId = 465303; }; + deliciouslytyped = { + email = "47436522+deliciouslytyped@users.noreply.github.com"; + github = "deliciouslytyped"; + githubId = 47436522; + name = "deliciouslytyped"; + }; delroth = { email = "delroth@gmail.com"; github = "delroth"; @@ -4281,6 +4287,12 @@ githubId = 3661115; name = "Ingo Blechschmidt"; }; + icy-thought = { + name = "Icy-Thought"; + email = "gilganyx@pm.me"; + github = "Icy-Thought"; + githubId = 53710398; + }; idontgetoutmuch = { email = "dominic@steinitz.org"; github = "idontgetoutmuch"; @@ -7211,6 +7223,12 @@ githubId = 818502; name = "Nathan Yong"; }; + natto1784 = { + email = "natto@weirdnatto.in"; + github = "natto1784"; + githubId = 56316606; + name = "Amneesh Singh"; + }; nbren12 = { email = "nbren12@gmail.com"; github = "nbren12"; @@ -11709,6 +11727,16 @@ github = "pulsation"; githubId = 1838397; }; + princemachiavelli = { + name = "Josh Hoffer"; + email = "jhoffer@sansorgan.es"; + github = "princemachiavelli"; + githubId = 2730968; + keys = [{ + longkeyid = "ed25519/0x83124F97A318EA18"; + fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18"; + }]; + }; ydlr = { name = "ydlr"; email = "ydlr@ydlr.io"; diff --git a/nixos/modules/services/audio/roon-bridge.nix b/nixos/modules/services/audio/roon-bridge.nix new file mode 100644 index 00000000000..85273a2039c --- /dev/null +++ b/nixos/modules/services/audio/roon-bridge.nix @@ -0,0 +1,74 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + name = "roon-bridge"; + cfg = config.services.roon-bridge; +in { + options = { + services.roon-bridge = { + enable = mkEnableOption "Roon Bridge"; + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open ports in the firewall for the bridge. + + UDP: 9003 + TCP: 9100 - 9200 + ''; + }; + user = mkOption { + type = types.str; + default = "roon-bridge"; + description = '' + User to run the Roon bridge as. + ''; + }; + group = mkOption { + type = types.str; + default = "roon-bridge"; + description = '' + Group to run the Roon Bridge as. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.roon-bridge = { + after = [ "network.target" ]; + description = "Roon Bridge"; + wantedBy = [ "multi-user.target" ]; + + environment.ROON_DATAROOT = "/var/lib/${name}"; + + serviceConfig = { + ExecStart = "${pkgs.roon-bridge}/start.sh"; + LimitNOFILE = 8192; + User = cfg.user; + Group = cfg.group; + StateDirectory = name; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPortRanges = [ + { from = 9100; to = 9200; } + ]; + allowedUDPPorts = [ 9003 ]; + }; + + + users.groups.${cfg.group} = {}; + users.users.${cfg.user} = + if cfg.user == "roon-bridge" then { + isSystemUser = true; + description = "Roon Bridge user"; + group = cfg.group; + extraGroups = [ "audio" ]; + } + else {}; + }; +} diff --git a/nixos/modules/services/hardware/auto-cpufreq.nix b/nixos/modules/services/hardware/auto-cpufreq.nix index 72c4eccaff7..f846476b30b 100644 --- a/nixos/modules/services/hardware/auto-cpufreq.nix +++ b/nixos/modules/services/hardware/auto-cpufreq.nix @@ -12,7 +12,13 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ pkgs.auto-cpufreq ]; - systemd.packages = [ pkgs.auto-cpufreq ]; - systemd.services.auto-cpufreq.path = with pkgs; [ bash coreutils ]; + systemd = { + packages = [ pkgs.auto-cpufreq ]; + services.auto-cpufreq = { + # Workaround for https://github.com/NixOS/nixpkgs/issues/81138 + wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ bash coreutils ]; + }; + }; }; } diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix index 7cee125f6e7..3d280ca72ab 100644 --- a/pkgs/applications/audio/gbsplay/default.nix +++ b/pkgs/applications/audio/gbsplay/default.nix @@ -1,28 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, libpulseaudio }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, libpulseaudio, nas }: -stdenv.mkDerivation { - name = "gbsplay-2016-12-17"; +stdenv.mkDerivation rec { + pname = "gbsplay"; + version = "0.0.94"; src = fetchFromGitHub { owner = "mmitch"; repo = "gbsplay"; - rev = "2c4486e17fd4f4cdea8c3fd79ae898c892616b70"; - sha256 = "1214j67sr87zfhvym41cw2g823fmqh4hr451r7y1s9ql3jpjqhpz"; + rev = version; + sha256 = "VpaXbjotmc/Ref1geiKkBX9UhbPxfAGkFAdKVxP8Uxo="; }; - buildInputs = [ libpulseaudio ]; + configureFlags = [ + "--without-test" # See mmitch/gbsplay#62 + "--without-contrib" + ]; - configureFlags = - [ "--without-test" "--without-contrib" "--disable-devdsp" - "--enable-pulse" "--disable-alsa" "--disable-midi" - "--disable-nas" "--disable-dsound" "--disable-i18n" ]; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ libpulseaudio nas ]; - makeFlags = [ "tests=" ]; + postInstall = '' + installShellCompletion --bash --name gbsplay contrib/gbsplay.bashcompletion + ''; meta = with lib; { - description = "gameboy sound player"; + description = "Gameboy sound player"; license = licenses.gpl1; - platforms = ["i686-linux" "x86_64-linux"]; + platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ dasuxullebt ]; }; } diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 705685811ff..773560c83ca 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -17,11 +17,12 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.28"; + version = "6.29"; src = fetchurl { - url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - hash = "sha256-38HSjR+rQWPzMOjq1abLn/MP3DCz5YzBg0v2kBsQmR4="; + url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.targetPlatform.qemuArch}.tar.xz"; + hash = if stdenv.isx86_64 then "sha256-DOul6J2Y7szy4+Q4SeO0uG6PSuU+MELE7ky8W3mSpTQ=" + else "sha256-67iTi6bFlbQtyCjnPIjK8K/3aV+zaCsWBRCWmgYonM4="; }; nativeBuildInputs = [ @@ -74,7 +75,7 @@ stdenv.mkDerivation rec { description = "Digital audio workstation"; homepage = "https://www.reaper.fm/"; license = licenses.unfree; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ jfrankenau ilian ]; }; } diff --git a/pkgs/applications/misc/anup/default.nix b/pkgs/applications/misc/anup/default.nix new file mode 100644 index 00000000000..9c99c84eabe --- /dev/null +++ b/pkgs/applications/misc/anup/default.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, fetchFromGitHub, sqlite, xdg-utils}: + +rustPlatform.buildRustPackage rec { + pname = "anup"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "Acizza"; + repo = "anup"; + rev = version; + sha256 = "sha256-4pXF4p4K8+YihVB9NdgT6bOidmQEgWXUbcbvgXJ0IDA="; + }; + + buildInputs = [ + sqlite + xdg-utils + ]; + + cargoSha256 = "sha256-1TA2HDHKA3twFtlAWaC2zcRzS8TJwcbBt1OTQ3hC3qM="; + + meta = with lib; { + homepage = "https://github.com/Acizza/anup"; + description = "An anime tracker for AniList featuring a TUI"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ natto1784 ]; + }; +} diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 9c8f060f169..f7a56a48fc7 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "sha256-wH0MTTwUmi/QZXo3vWgRYmlPxMxgfhghrTIZAwdVjQ0="; + sha256 = "sha256-YKGCZm0BaFLi+kujl04B4IU1qay15XNfvelxfUkCP8o="; }; subPackages = [ "cmd/cheat" ]; diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index a67d79f9bf9..0daaad2f265 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, wrapGAppsHook, python3Packages }: +{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, webkitgtk, wrapGAppsHook, python3Packages }: python3Packages.buildPythonApplication rec { pname = "skytemple"; @@ -11,7 +11,15 @@ python3Packages.buildPythonApplication rec { sha256 = "0l2c4qngv58j6zkp0va6m96zksx8gqn3mjc3isqybfnhjr6nd3v9"; }; - buildInputs = [ gobject-introspection gtk3 gtksourceview3 ]; + buildInputs = [ + gobject-introspection + gtk3 + gtksourceview3 + # webkitgkt is used for rendering interactive statistics graph which + # can be seen by opening a ROM, entering Pokemon section, selecting + # any Pokemon, and clicking Stats and Moves tab. + webkitgtk + ]; nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; propagatedBuildInputs = with python3Packages; [ natsort diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 19fdd4640e4..7420267aa7d 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -5,13 +5,13 @@ }: let - version = "4.9.10"; + version = "5.0.1"; subsurfaceSrc = (fetchFromGitHub { owner = "Subsurface"; repo = "subsurface"; rev = "v${version}"; - sha256 = "12ndhjplz3cwndwzhfc959dc0i6rm2qf3v2d8n9kba8nj63iblfs"; + sha256 = "01r836ckvrmgprjf4cqxn2n3w5w4pa2fjrhspjndsspic8nwlrwg"; fetchSubmodules = true; }); @@ -40,13 +40,13 @@ let googlemaps = stdenv.mkDerivation rec { pname = "googlemaps"; - version = "2018-06-02"; + version = "2021-03-19"; src = fetchFromGitHub { owner = "vladest"; repo = "googlemaps"; - rev = "54a357f9590d9cf011bf1713589f66bad65e00eb"; - sha256 = "159kslp6rj0qznzxijppwvv8jnswlfgf2pw4x8ladi8vp6bzxnzi"; + rev = "8f7def10c203fd3faa5ef96c5010a7294dca0759"; + sha256 = "1irz398g45hk6xizwzd07qcx1ln8f7l6bhjh15f56yc20waqpx1x"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 6dacc008304..5fa05a9fb58 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.139.7"; + version = "0.139.8"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-mxnl5ALave2E61AqJAHlLHDLHOwA2wwjs3sb4WnG82A="; + sha256 = "sha256-4QNtjVc2/diJO92xn4J2ZJO7JYDHmPgOE4kGndU5RW0="; }; - vendorSha256 = "sha256-tdsQx2AvbRC8l7YZFBg2xVqo0CLrOOwA9Nmuei+1ozw="; + vendorSha256 = "sha256-GY2+oecRbI5hEVI5lCsTuU3WYIfUGceINyXGPjorisE="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 88ba44b2e24..6070308bec6 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube3d"; - version = "4.4.4"; + version = "4.4.5"; src = fetchFromGitHub { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-pfyU25MASKQMwd49IbNyyEiz3gmSOBmLdWtIKhYU2wg="; + sha256 = "sha256-nT/17R1Gky9509U077tgwS7iQKRMJUk8rwQiHSHcP+s="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 715f75ddc8a..c792a38001a 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tanka"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aCgr56nXZCkG8k/ZGH2/cDOaqkznnyb6JLEcImqLH64="; + sha256 = "sha256-KvQIVJZD/VvLE5RocWLRVGbb8faLY2cBeFSE/6E7x50="; }; vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw="; diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index db8d4472b07..ab6274cdf34 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -12,7 +12,8 @@ , coreutils , gawk , xdg-utils -, systemd }: +, systemd +, enableRectOverlay ? false }: stdenv.mkDerivation rec { pname = "teams"; @@ -57,9 +58,11 @@ stdenv.mkDerivation rec { ln -s $out/opt/teams/teams $out/bin/ + ${lib.optionalString (!enableRectOverlay) '' # Work-around screen sharing bug # https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay + ''} runHook postInstall ''; diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix new file mode 100644 index 00000000000..1f7d663cf8e --- /dev/null +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -0,0 +1,33 @@ +{ appimageTools, lib, fetchurl }: + +let + pname = "electron-mail"; + version = "4.12.2"; + name = "ElectronMail-${version}"; + + src = fetchurl { + url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; + sha256 = "D+0qoIb0EwUVbgKOiKQpqoLDgm8l/UKDWm/BjhW4MYU="; + }; + + appimageContents = appimageTools.extract { inherit name src; }; +in appimageTools.wrapType2 { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail"; + homepage = "https://github.com/vladimiry/ElectronMail"; + license = licenses.mit; + maintainers = [ maintainers.princemachiavelli ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index b7e9f220f00..d53464df7a9 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -1,22 +1,34 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, ldc, installShellFiles, pkg-config -, curl, sqlite, libnotify -, withSystemd ? stdenv.isLinux, systemd ? null }: +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, ldc +, installShellFiles +, pkg-config +, curl +, sqlite +, libnotify +, withSystemd ? stdenv.isLinux +, systemd +}: stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.11"; + version = "2.4.12"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ioOrkhVeHHqIjoEXcYo8ATJW+2+nZOehf3XbAJUEXpY="; + sha256 = "sha256-rG9W90+wGLnhnfhqJjUIFGP6ZcmaxGkrdhPxQVRyxoc="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; buildInputs = [ - curl sqlite libnotify + curl + sqlite + libnotify ] ++ lib.optional withSystemd systemd; configureFlags = [ @@ -36,8 +48,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A complete tool to interact with OneDrive on Linux"; homepage = "https://github.com/abraunegg/onedrive"; - license = licenses.gpl3; - maintainers = with maintainers; [ srgom ianmjones ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ srgom peterhoeg ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix index de6f9212983..d1523b571f4 100644 --- a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix +++ b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost169, flatbuffers, fmt, rapidjson, spdlog, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, fmt, rapidjson, spdlog, zlib }: stdenv.mkDerivation rec { pname = "vowpal-wabbit"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - boost169 + boost flatbuffers fmt rapidjson diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index f4b74405eba..3817ce7fa4f 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.4.4"; + version = "1.5.1"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "1w5kpca2v6iii912riywp1jscq7cpr5xv93mglr30pjnar1mk8gs"; + sha256 = "1ffgh5826985phc8amvzl9iydvsnij5brh4gczfh201vfmw9d4hh"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index bec51af81ac..ee7c4d6bcfa 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -11,7 +11,7 @@ rec { , tiniRev, tiniSha256, buildxSupport ? false # package dependencies , stdenv, fetchFromGitHub, buildGoPackage - , makeWrapper, installShellFiles, pkg-config + , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute2, lvm2, systemd, docker-buildx , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git @@ -56,7 +56,9 @@ rec { }; # Do not remove static from make files as we want a static binary - patchPhase = ""; + postPatch = ""; + + buildInputs = [ glibc glibc.static ]; NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; }); diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index dd7bcb19978..76668301c6b 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, glibc }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { version = "0.19.0"; @@ -11,12 +11,11 @@ stdenv.mkDerivation rec { sha256 ="1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4"; }; - patchPhase = "sed -i /tini-static/d CMakeLists.txt"; + postPatch = "sed -i /tini-static/d CMakeLists.txt"; NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"; nativeBuildInputs = [ cmake ]; - buildInputs = [ glibc glibc.static ]; meta = with lib; { description = "A tiny but valid init for containers"; diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 210902a0e71..9689fddd391 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -1,22 +1,18 @@ -{ lib -, stdenv -, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "google-fonts"; - version = "unstable-2021-01-19"; + version = "unstable-2021-06-12"; outputs = [ "out" "adobeBlank" ]; src = fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "a3a831f0fe44cd58465c6937ea06873728f2ba0d"; - sha256 = "19abx2bj7mkysv2ihr43m3kpyf6kv6v2qjlm1skxc82rb72xqhix"; + rev = "370c795d7e5f9b02db9a793c2779e2c8f94c6adc"; + sha256 = "sha256-XKjxmupY2KuefCtKZMXWaba1TnNwdYM/P0xGXOtBGmM="; }; - phases = [ "unpackPhase" "patchPhase" "installPhase" ]; - patchPhase = '' # These directories need to be removed because they contain # older or duplicate versions of fonts also present in other @@ -33,6 +29,8 @@ stdenv.mkDerivation { fi ''; + dontBuild = true; + installPhase = '' adobeBlankDest=$adobeBlank/share/fonts/truetype install -m 444 -Dt $adobeBlankDest ofl/adobeblank/AdobeBlank-Regular.ttf diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix index 435cdb7d163..6bdd331c72c 100644 --- a/pkgs/data/fonts/ricty/default.nix +++ b/pkgs/data/fonts/ricty/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.1.1"; src = fetchurl { - url = "http://www.yusa.lab.uec.ac.jp/~yusa/ricty/ricty_generator-${version}.sh"; + url = "https://rictyfonts.github.io/files/ricty_generator-${version}.sh"; sha256 = "03fngb8f5hl7ifigdm5yljhs4z2x80cq8y8kna86d07ghknhzgw6"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high-quality Japanese font based on Inconsolata and Migu 1M"; - homepage = "http://www.yusa.lab.uec.ac.jp/~yusa/ricty.html"; + homepage = "https://rictyfonts.github.io"; license = licenses.unfree; maintainers = [ maintainers.mikoim ]; }; diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index bdc7b55d9c2..a2426e842a6 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "1qnqz0h2c5kilch3308l8nfshgsrkllyysvqn0mxy70iziw895rv"; + sha256 = "sha256-tSkTwhhugvDTzzcxIln1xq3ZY6boHJR0LRGy20ONO5U="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/data/icons/whitesur-icon-theme/default.nix new file mode 100644 index 00000000000..95f41caca1a --- /dev/null +++ b/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, gnome +, gnome-icon-theme +, hicolor-icon-theme +}: + +stdenvNoCC.mkDerivation rec { + pname = "Whitesur-icon-theme"; + version = "2021-05-20"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "KboUYozTleOBKNun66g2oj7u/36hyQsPtRSk/x/LAWo="; + }; + + nativeBuildInputs = [ gtk3 ]; + + buildInputs = [ + gnome-icon-theme + gnome.adwaita-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons/WhiteSur{,-dark}/status + echo "$out/share/icons/WhiteSur/status $out/share/icons/WhiteSur-dark/status" | xargs -n 1 cp -r src/status/{16,22,24,32,symbolic} + echo "$out/share/icons/WhiteSur $out/share/icons/WhiteSur-dark" | xargs -n 1 cp -r ./{COPYING,AUTHORS} src/index.theme src/{actions,animations,apps,categories,devices,emblems,mimes,places} links/{actions,apps,categories,devices,emblems,mimes,places,status} + + # Change icon color for dark theme + sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/{actions,devices,places,status}/{16,22,24}/* + sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/actions/32/* + sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/{actions,apps,categories,emblems,devices,mimes,places,status}/symbolic/* + + for f in actions animations apps categories devices emblems mimes places status; do + ln -sf $out/share/icons/WhiteSur/$f $out/share/icons/WhiteSur/$f@2x + ln -sf $out/share/icons/WhiteSur-dark/$f $out/share/icons/WhiteSur-dark/$f@2x + done + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + + runHook postInstall + ''; + + meta = with lib; { + description = "MacOS Big Sur style icon theme for Linux desktops"; + homepage = "https://github.com/vinceliuice/WhiteSur-icon-theme"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ icy-thought ]; + }; + +} diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 03b1cca9fd8..aadb1a989f4 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "1.1"; + version = "1.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - sha256 = "NBlP10IM/+u8IRds4bdFyGWg3pJLRmlSLsdlndMVQqg="; + sha256 = "sha256-jBGrfE8jYQStIs9h/b/1yBu8OEQdPOMHZ/U/KczfX+4="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index bdd7c9cc1a3..18bfea263f9 100644 --- a/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.16"; + version = "3.22.17"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = version; - sha256 = "0arjnm5kgnb4pir53hlm94iym80d0srs256sm2hwhwwc5fr1w79i"; + sha256 = "sha256-14z/EdEz1XFDrQZlpoeHW73G187XuZX/uQXp+bAUsmI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/armips/default.nix b/pkgs/development/compilers/armips/default.nix new file mode 100644 index 00000000000..b6fbb5ef34c --- /dev/null +++ b/pkgs/development/compilers/armips/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "armips"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "Kingcom"; + repo = "armips"; + rev = "v${version}"; + sha256 = "sha256-L+Uxww/WtvDJn1xZqoqA6Pkzq/98sy1qTxZbv6eEjbA="; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp armips $out/bin + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/Kingcom/armips"; + description = "Assembler for various ARM and MIPS platforms."; + license = licenses.mit; + maintainers = with maintainers; [ marius851000 ]; + }; +} diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix deleted file mode 100644 index beafd6414f4..00000000000 --- a/pkgs/development/compilers/compcert/default.nix +++ /dev/null @@ -1,125 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper -, coqPackages, ocamlPackages, coq2html -, tools ? stdenv.cc -, version ? "3.9" -}: - -let - ocaml-pkgs = with ocamlPackages; [ ocaml findlib menhir menhirLib ]; - ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"; - inherit (coqPackages) coq flocq; - inherit (lib) optional optionalString; -in - -let param = { - "3.7" = { - sha256 = "1h4zhk9rrqki193nxs9vjvya7nl9yxjcf07hfqb6g77riy1vd2jr"; - patches = [ - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/0a2db0269809539ccc66f8ec73637c37fbd23580.patch"; - sha256 = "0n8qrba70x8f422jdvq9ddgsx6avf2dkg892g4ldh3jiiidyhspy"; - }) - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/5e29f8b5ba9582ecf2a1d0baeaef195873640607.patch"; - sha256 = "184nfdgxrkci880lkaj5pgnify3plka7xfgqrgv16275sqppc5hc"; - }) - ]; - }; - "3.8" = { - sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7"; - patches = [ - # Support for Coq 8.12.2 - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/06956421b4307054af221c118c5f59593c0e67b9.patch"; - sha256 = "1f90q6j3xfvnf3z830bkd4d8526issvmdlrjlc95bfsqs78i1yrl"; - }) - # Support for Coq 8.13.0 - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/0895388e7ebf9c9f3176d225107e21968919fb97.patch"; - sha256 = "0qhkzgb2xl5kxys81pldp3mr39gd30lvr2l2wmplij319vp3xavd"; - }) - # Support for Coq 8.13.1 - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/6bf310dd678285dc193798e89fc2c441d8430892.patch"; - sha256 = "026ahhvpj5pksy90f8pnxgmhgwfqk4kwyvcf8x3dsanvz98d4pj5"; - }) - # Drop support for Coq < 8.9 - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/7563a5df926a4c6fb1489a7a4c847641c8a35095.patch"; - sha256 = "05vkslzy399r3dm6dmjs722rrajnyfa30xsyy3djl52isvn4gyfb"; - }) - # Support for Coq 8.13.2 - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/48bc183167c4ce01a5c9ea86e49d60530adf7290.patch"; - sha256 = "0j62lppfk26d1brdp3qwll2wi4gvpx1k70qivpvby5f7dpkrkax1"; - }) - ]; - useExternalFlocq = true; - }; - "3.9" = { - sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb"; - useExternalFlocq = true; - }; -}."${version}"; in - -stdenv.mkDerivation rec { - pname = "compcert"; - inherit version; - - src = fetchFromGitHub { - owner = "AbsInt"; - repo = "CompCert"; - rev = "v${version}"; - inherit (param) sha256; - }; - - patches = param.patches or []; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = ocaml-pkgs ++ [ coq coq2html ]; - propagatedBuildInputs = optional (param.useExternalFlocq or false) flocq; - enableParallelBuilding = true; - - postPatch = '' - substituteInPlace ./configure \ - --replace \$\{toolprefix\}ar 'ar' \ - --replace '{toolprefix}gcc' '{toolprefix}cc' - ''; - - configurePhase = '' - ./configure -clightgen \ - -prefix $out \ - -coqdevdir $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ \ - -toolprefix ${tools}/bin/ \ - ${optionalString (param.useExternalFlocq or false) "-use-external-Flocq"} \ - ${ccomp-platform} - ''; - - installTargets = "documentation install"; - postInstall = '' - # move man into place - mkdir -p $man/share - mv $out/share/man/ $man/share/ - - # move docs into place - mkdir -p $doc/share/doc/compcert - mv doc/html $doc/share/doc/compcert/ - - # wrap ccomp to undefine _FORTIFY_SOURCE; ccomp invokes cc1 which sets - # _FORTIFY_SOURCE=2 by default, but undefines __GNUC__ (as it should), - # which causes a warning in libc. this suppresses it. - for x in ccomp clightgen; do - wrapProgram $out/bin/$x --add-flags "-U_FORTIFY_SOURCE" - done - ''; - - outputs = [ "out" "lib" "doc" "man" ]; - - meta = with lib; { - description = "Formally verified C compiler"; - homepage = "https://compcert.org"; - license = licenses.inria-compcert; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ thoughtpolice jwiegley vbgl ]; - }; -} diff --git a/pkgs/development/compilers/llvm/git/libcxx/default.nix b/pkgs/development/compilers/llvm/git/libcxx/default.nix index 8fb6b4a7dbd..f511eba81dc 100644 --- a/pkgs/development/compilers/llvm/git/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, src, cmake, python3, libcxxabi, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta, src, cmake, python3, fixDarwinDylibNames, version , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -24,10 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; - cmakeFlags = [ - "-DLIBCXX_CXX_ABI=libcxxabi" ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" ++ lib.optional stdenv.hostPlatform.isWasm [ diff --git a/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch index 1f9de00a9d5..f59d7f8dfaf 100644 --- a/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9bf1a02f0908..612cd4aab76c 100644 +index 06ee1d74a03e..6c3c6f8f8d47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,8 @@ set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build") @@ -9,92 +9,73 @@ index 9bf1a02f0908..612cd4aab76c 100644 + include(GNUInstallDirs) + set(PACKAGE_NAME libcxx) - set(PACKAGE_VERSION 12.0.0) + set(PACKAGE_VERSION 13.0.0git) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -402,7 +404,7 @@ endif () - if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) - set(LIBCXX_HEADER_DIR ${LLVM_BINARY_DIR}) -- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) -+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) +@@ -409,7 +411,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") if(LIBCXX_LIBDIR_SUBDIR) - string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) - string(APPEND LIBCXX_INSTALL_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) -@@ -410,11 +412,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - elseif(LLVM_LIBRARY_OUTPUT_INTDIR) +@@ -420,14 +422,14 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) - set(LIBCXX_HEADER_DIR ${LLVM_BINARY_DIR}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") - set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}") else() set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) - set(LIBCXX_HEADER_DIR ${CMAKE_BINARY_DIR}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") - set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}") endif() - - file(MAKE_DIRECTORY "${LIBCXX_BINARY_INCLUDE_DIR}") diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake -index 5d2764e870e9..bb1ec5de6ca2 100644 +index 5a8a4a270a1a..c06bae0001aa 100644 --- a/cmake/Modules/HandleLibCXXABI.cmake +++ b/cmake/Modules/HandleLibCXXABI.cmake @@ -63,7 +63,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) if (LIBCXX_INSTALL_HEADERS) install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" -- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dstdir} -+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} +- DESTINATION include/c++/v1/${dstdir} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} COMPONENT cxx-headers PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index 29a317b8ae9a..4747263cfd1b 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -252,7 +252,7 @@ if (LIBCXX_INSTALL_HEADERS) - foreach(file ${files}) - get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} -- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dir} -+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dir} - COMPONENT cxx-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - ) -@@ -260,7 +260,7 @@ if (LIBCXX_INSTALL_HEADERS) - - # Install the generated header as __config. - install(FILES ${LIBCXX_BINARY_DIR}/__generated_config -- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1 -+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - RENAME __config - COMPONENT cxx-headers) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9965104cb5b2..9b55dbb1d822 100644 +index 87b71f7ba334..d20a783079b7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -352,21 +352,21 @@ if (LIBCXX_INSTALL_SHARED_LIBRARY) +@@ -369,21 +369,21 @@ if (LIBCXX_INSTALL_SHARED_LIBRARY) install(TARGETS cxx_shared - ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx - LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx -- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) -+ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION bin COMPONENT cxx) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) endif() if (LIBCXX_INSTALL_STATIC_LIBRARY) install(TARGETS cxx_static - ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx - LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx -- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) -+ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION bin COMPONENT cxx) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) endif() if(LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY) install(TARGETS cxx_experimental - LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx - ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx -- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) -+ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION bin COMPONENT cxx) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) endif() # NOTE: This install command must go after the cxx install command otherwise diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 3bb82d651ec..7fadc6d6dca 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, llvm_meta, cmake, python3, src, libunwind, version , enableShared ? !stdenv.hostPlatform.isStatic +, libcxx }: stdenv.mkDerivation rec { @@ -26,7 +27,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ]; buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; - cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + cmakeFlags = [ + "-DLIBCXXABI_LIBCXX_INCLUDES=${libcxx.dev}/include/c++/v1" + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch index b49b1685940..45641acb0c7 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 426c855288fc..a9812a994f53 100644 +index 1e8b73aa38cc..6f7b2a25d205 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,8 @@ set(LIBCXXABI_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH @@ -9,26 +9,28 @@ index 426c855288fc..a9812a994f53 100644 + include(GNUInstallDirs) + set(PACKAGE_NAME libcxxabi) - set(PACKAGE_VERSION 11.0.0) + set(PACKAGE_VERSION 11.0.0git) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -180,17 +182,17 @@ set(CMAKE_MODULE_PATH - +@@ -196,7 +198,7 @@ set(CMAKE_MODULE_PATH if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) -- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) -+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) + set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) string(APPEND LIBCXXABI_INSTALL_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) - endif() +@@ -204,11 +206,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) - set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) else() + set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) - set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) endif() - set(LIBCXXABI_INSTALL_PREFIX "" CACHE STRING "Define libc++abi destination prefix.") + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR}) diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index a31a9e6ca43..60ca574f1cc 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { export HOME=$TMPDIR; ''; + doCheck = true; + checkPhase = '' + runHook preCheck + ./zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig + runHook postCheck + ''; + meta = with lib; { homepage = "https://ziglang.org/"; description = @@ -48,4 +55,4 @@ stdenv.mkDerivation rec { broken = stdenv.isDarwin; }; } -# TODO: checkPhase + diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index ad5caec9492..c3bd33ce4bf 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -9,10 +9,8 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ { case = range "8.12" "8.13"; out = "2.7.1"; } - { case = "8.11"; out = "2.6"; } ] null; release."2.7.1".sha256 = "1674j7bkvihiv19vizm99dp6gj3lryb00zx6a87jz214f3ydcvnj"; - release."2.6".sha256 = "00bf9hl4pvmsqa08lzjs1mrxyfgfxq4k6778pnldmc8ichm90jgk"; releaseRev = v: "v${v}"; propagatedBuildInputs = [ compcert ]; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix new file mode 100644 index 00000000000..978cea5b09e --- /dev/null +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -0,0 +1,109 @@ +{ lib, fetchzip, mkCoqDerivation, coq, flocq, compcert +, ocamlPackages, fetchpatch, makeWrapper, coq2html +, stdenv, tools ? stdenv.cc +, version ? null +}: + +with lib; + +let compcert = mkCoqDerivation rec { + + pname = "compcert"; + owner = "AbsInt"; + + inherit version; + releaseRev = v: "v${v}"; + + defaultVersion = with versions; switch coq.version [ + { case = range "8.8" "8.13"; out = "3.8"; } + ] null; + + release = { + "3.8".sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7"; + "3.9".sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = with ocamlPackages; [ ocaml findlib menhir menhirLib ] ++ [ coq coq2html ]; + propagatedBuildInputs = [ flocq ]; + + enableParallelBuilding = true; + + postPatch = '' + substituteInPlace ./configure \ + --replace \$\{toolprefix\}ar 'ar' \ + --replace '{toolprefix}gcc' '{toolprefix}cc' + ''; + + configurePhase = '' + ./configure -clightgen \ + -prefix $out \ + -coqdevdir $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ \ + -toolprefix ${tools}/bin/ \ + -use-external-Flocq \ + ${if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"} + ''; + + installTargets = "documentation install"; + postInstall = '' + # move man into place + mkdir -p $man/share + mv $out/share/man/ $man/share/ + + # move docs into place + mkdir -p $doc/share/doc/compcert + mv doc/html $doc/share/doc/compcert/ + + # wrap ccomp to undefine _FORTIFY_SOURCE; ccomp invokes cc1 which sets + # _FORTIFY_SOURCE=2 by default, but undefines __GNUC__ (as it should), + # which causes a warning in libc. this suppresses it. + for x in ccomp clightgen; do + wrapProgram $out/bin/$x --add-flags "-U_FORTIFY_SOURCE" + done + ''; + + outputs = [ "out" "lib" "doc" "man" ]; + + meta = with lib; { + description = "Formally verified C compiler"; + homepage = "https://compcert.org"; + license = licenses.inria-compcert; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ thoughtpolice jwiegley vbgl ]; + }; +}; in +compcert.overrideAttrs (o: + { + patches = with versions; switch [ coq.version o.version ] [ + { cases = [ (range "8.12.2" "8.13.2") "3.8" ]; + out = [ + # Support for Coq 8.12.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/06956421b4307054af221c118c5f59593c0e67b9.patch"; + sha256 = "1f90q6j3xfvnf3z830bkd4d8526issvmdlrjlc95bfsqs78i1yrl"; + }) + # Support for Coq 8.13.0 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/0895388e7ebf9c9f3176d225107e21968919fb97.patch"; + sha256 = "0qhkzgb2xl5kxys81pldp3mr39gd30lvr2l2wmplij319vp3xavd"; + }) + # Support for Coq 8.13.1 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/6bf310dd678285dc193798e89fc2c441d8430892.patch"; + sha256 = "026ahhvpj5pksy90f8pnxgmhgwfqk4kwyvcf8x3dsanvz98d4pj5"; + }) + # Drop support for Coq < 8.9 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/7563a5df926a4c6fb1489a7a4c847641c8a35095.patch"; + sha256 = "05vkslzy399r3dm6dmjs722rrajnyfa30xsyy3djl52isvn4gyfb"; + }) + # Support for Coq 8.13.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/48bc183167c4ce01a5c9ea86e49d60530adf7290.patch"; + sha256 = "0j62lppfk26d1brdp3qwll2wi4gvpx1k70qivpvby5f7dpkrkax1"; + }) + ]; + } + ] []; + } +) diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 558fa45a1fd..d86ea48afe1 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -124,15 +124,15 @@ let ln -s ${extraInit} $out/lib/php.ini if test -e $out/bin/php; then - wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib + wrapProgram $out/bin/php --prefix PHP_INI_SCAN_DIR : $out/lib fi if test -e $out/bin/php-fpm; then - wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib + wrapProgram $out/bin/php-fpm --prefix PHP_INI_SCAN_DIR : $out/lib fi if test -e $out/bin/phpdbg; then - wrapProgram $out/bin/phpdbg --set PHP_INI_SCAN_DIR $out/lib + wrapProgram $out/bin/phpdbg --prefix PHP_INI_SCAN_DIR : $out/lib fi ''; }; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 9e81ce0c6c8..9fdccfb3faa 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.5.1"; + version = "10.5.2"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-lq1uHLzyjz0cH/ly3ixA2t3b12gyVrrVAtPEY9L2TN8="; + sha256 = "sha256-Y/I87cVIpelASBblDPj4/MSSqxqtxsDO8wv8Kvzq2V8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix new file mode 100644 index 00000000000..a1c90f6b463 --- /dev/null +++ b/pkgs/development/libraries/cglm/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "cglm"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "recp"; + repo = "cglm"; + rev = "v${version}"; + sha256 = "0crzkxan3kivyah225md5c65zglg5c1cgrsmwhvp51hmrpmxss5v"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://github.com/recp/cglm"; + description = "Highly Optimized Graphics Math (glm) for C"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index f4fe894eaf4..7c89e98576a 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libquotient"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "sha256-QSpkcQEDTMsFbQBa7dTuL/5HraVChUHqUuJdNMty/4s="; + sha256 = "sha256-fAzYv9OsanXqocEvbSB3OA9OVicwcZ0xT9uYbrFPEHc="; }; buildInputs = [ qtbase qtmultimedia ]; diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index 66198a6ec33..7bba6e8b404 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libusbmuxd"; - version = "2.0.2"; + version = "unstable-2021-02-06"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = version; - sha256 = "139pzsnixkck6ly1q6p0diqr0hgd0mx0pr4xx1jamm3f3656kpf9"; + rev = "3eb50a07bad4c2222e76df93b23a0161922150d1"; + sha256 = "sha256-pBPBgE6s8JYKJYEV8CcumNki+6jD5r7HzQ0nZ8yQLdM="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2a586f9e9ef..77a6b513ee6 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -54,7 +54,10 @@ let outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc"; setOutputFlags = false; - separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; + separateDebugInfo = + !stdenv.hostPlatform.isDarwin && + !(stdenv.hostPlatform.useLLVM or false) && + stdenv.cc.isGNU; nativeBuildInputs = [ perl ]; buildInputs = lib.optional withCryptodev cryptodev diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix index 193ec53d5ad..870aa068afe 100644 --- a/pkgs/development/misc/newlib/default.nix +++ b/pkgs/development/misc/newlib/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, buildPackages }: -let version = "3.3.0"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "newlib"; - inherit version; + version = "4.1.0"; + src = fetchurl { url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz"; - sha256 = "0ricyx792ig2cb2x31b653yb7w7f7mf2111dv5h96lfzmqz9xpaq"; + sha256 = "0m01sjjyj0ib7bwlcrvmk1qkkgd66zf1dhbw716j490kymrf75pj"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix new file mode 100644 index 00000000000..2c64230db26 --- /dev/null +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, geojson +, haversine +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aio-geojson-client"; + version = "0.14"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-client"; + rev = "v${version}"; + sha256 = "1nk0mas71n1bn4wc7pcv279i1b5mxy9phyc8ppxlb16kbjnjj0h8"; + }; + + propagatedBuildInputs = [ + aiohttp + geojson + haversine + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aio_geojson_client" ]; + + meta = with lib; { + description = "Python module for accessing GeoJSON feeds"; + homepage = "https://github.com/exxamalte/python-aio-geojson-client"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix new file mode 100644 index 00000000000..2def7919fa1 --- /dev/null +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -0,0 +1,43 @@ +{ lib +, aio-geojson-client +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pytz +}: + +buildPythonPackage rec { + pname = "aio-geojson-geonetnz-quakes"; + version = "0.12"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-geonetnz-quakes"; + rev = "v${version}"; + sha256 = "166gvcc1rzigb822k1373y18k54x5aklikr8sc7hyml5vz937xr7"; + }; + + propagatedBuildInputs = [ + aio-geojson-client + aiohttp + pytz + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aio_geojson_geonetnz_quakes" ]; + + meta = with lib; { + description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds"; + homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-quakes"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix new file mode 100644 index 00000000000..97adb2f8fe0 --- /dev/null +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -0,0 +1,45 @@ +{ lib +, aio-geojson-client +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pytz +}: + +buildPythonPackage rec { + pname = "aio-geojson-geonetnz-volcano"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-geonetnz-volcano"; + rev = "v${version}"; + sha256 = "0x4i9gjwb2j788aw4j47bxin0d2ma3khssprq4ga3cjzx2qjwjvn"; + }; + + propagatedBuildInputs = [ + aio-geojson-client + aiohttp + pytz + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aio_geojson_geonetnz_volcano" ]; + + meta = with lib; { + description = "Python module for accessing the GeoNet NZ Volcanic GeoJSON feeds"; + homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-volcano"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix new file mode 100644 index 00000000000..792f91bc7f1 --- /dev/null +++ b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix @@ -0,0 +1,45 @@ +{ lib +, aio-geojson-client +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pytz +}: + +buildPythonPackage rec { + pname = "aio-geojson-nsw-rfs-incidents"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-nsw-rfs-incidents"; + rev = "v${version}"; + sha256 = "sha256-o9tuoJ7VZ6bg0rYeRWClKxdbxxj6wPgkSF7ZdOfmJew="; + }; + + propagatedBuildInputs = [ + aio-geojson-client + aiohttp + pytz + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aio_geojson_nsw_rfs_incidents" ]; + + meta = with lib; { + description = "Python module for accessing the NSW Rural Fire Service incidents feeds"; + homepage = "https://github.com/exxamalte/python-aio-geojson-nsw-rfs-incidents"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiotractive/default.nix b/pkgs/development/python-modules/aiotractive/default.nix new file mode 100644 index 00000000000..78d9ef43501 --- /dev/null +++ b/pkgs/development/python-modules/aiotractive/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "aiotractive"; + version = "0.5.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "zhulik"; + repo = pname; + rev = "v${version}"; + sha256 = "09zbca84dn1sprwqpfanmxxnmaknbzjz98xa87agpgy8xb3wpw7j"; + }; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "aiotractive" ]; + + meta = with lib; { + description = "Python client for the Tractive REST API"; + homepage = "https://github.com/zhulik/aiotractive"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index 02edcea42ef..e49f4ba53fe 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.59"; + version = "0.0.60"; # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - sha256 = "sha256-QuKWOo+QMBpVJglwvaSMbKKYMN/MW31E7BgIMchESG8="; + sha256 = "sha256-GWCiRxZ6pHrcVkOKNGxSK8lUD0RohtED8czXIWUoVaM="; }; propagatedBuildInputs = [ adb-shell pure-python-adb ] diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix new file mode 100644 index 00000000000..8a5694ffde7 --- /dev/null +++ b/pkgs/development/python-modules/async-lru/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "async-lru"; + version = "unstable-2020-10-24"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "async-lru"; + rev = "ae252508f9c5aecf9c02ddeb879d06c28dbffc42"; + sha256 = "1gk5qzdvhl2j1mw7xzchbw7bcgk9mzhvqa62nwwmvlbnx88pkwnc"; + }; + + postPatch = '' + sed -i '/^addopts/d' setup.cfg + ''; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + disabledTests = [ + # https://github.com/aio-libs/async-lru/issues/341 + "test_alru_cache_deco" + "test_alru_cache_fn_called" + "test_close" + ]; + + pythonImportsCheck = [ "async_lru" ]; + + meta = with lib; { + description = "Simple lru cache for asyncio"; + homepage = "https://github.com/wikibusiness/async_lru"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/click-threading/default.nix b/pkgs/development/python-modules/click-threading/default.nix index 1579a6a6a89..529ee08e4f8 100644 --- a/pkgs/development/python-modules/click-threading/default.nix +++ b/pkgs/development/python-modules/click-threading/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "click-threading"; - version = "0.4.4"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "b2b0fada5bf184b56afaccc99d0d2548d8ab07feb2e95e29e490f6b99c605de7"; + sha256 = "sha256-rc/mI8AqWVwQfDFAcvZ6Inj+TrQLcsDRoskDzHivNDk="; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/codespell/default.nix b/pkgs/development/python-modules/codespell/default.nix index 7427d391c61..d9b64cb8399 100644 --- a/pkgs/development/python-modules/codespell/default.nix +++ b/pkgs/development/python-modules/codespell/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "codespell"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "codespell-project"; repo = "codespell"; rev = "v${version}"; - sha256 = "187g26s3wzjmvdx9vjabbnajpbg0s9klixyv6baymmgz9lrcv4ln"; + sha256 = "sha256-BhYVztSr2MalILEcOcvMl07CObYa73o3kW8S/idqAO8="; }; checkInputs = [ aspell-python chardet pytestCheckHook pytest-cov pytest-dependency ]; diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 5646bca0473..45ec7364a59 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "configargparse"; - version = "1.4"; + version = "1.4.1"; src = fetchFromGitHub { owner = "bw2"; repo = "ConfigArgParse"; rev = "v${version}"; - sha256 = "0x6ar7d8qhr7gb1s8asbhqymg9jd635h7cyczqrbmvm8689zhj1d"; + sha256 = "sha256-hzhjrdrXxjksvbHlTnQVsT350g0yuG1F21fElv6bLSA="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix index 34eb0a158d9..6a6cc6ea804 100644 --- a/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastjsonschema"; - version = "2.14.5"; + version = "2.15.1"; disabled = pythonOlder "3.3"; @@ -17,19 +17,20 @@ buildPythonPackage rec { repo = "python-fastjsonschema"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1hgzafswdw5zqrd8qhdxa43crzfy7lrlifdn90133a0h3psr7qs1"; + sha256 = "sha256-ltxFJ3V5/bckusspQ5o0F4reMoB4KpYWPHF8ZNXGqVQ="; }; checkInputs = [ pytestCheckHook ]; dontUseSetuptoolsCheck = true; disabledTests = [ "benchmark" - # these tests require network access "remote ref" "definitions" ]; + pythonImportsCheck = [ "fastjsonschema" ]; + meta = with lib; { description = "Fast JSON schema validator for Python."; homepage = "https://horejsek.github.io/python-fastjsonschema/"; diff --git a/pkgs/development/python-modules/garminconnect-aio/default.nix b/pkgs/development/python-modules/garminconnect-aio/default.nix new file mode 100644 index 00000000000..bb754118e07 --- /dev/null +++ b/pkgs/development/python-modules/garminconnect-aio/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, brotlipy +, buildPythonPackage +, fetchFromGitHub +, yarl +}: + +buildPythonPackage rec { + pname = "garminconnect-aio"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "cyberjunky"; + repo = "python-garminconnect-aio"; + rev = version; + sha256 = "0s2gpy5hciv9akqqhxy0d2ywp6jp9mmdngx34q7fq3xn668kcrhr"; + }; + + propagatedBuildInputs = [ + aiohttp + brotlipy + yarl + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "garminconnect_aio" ]; + + meta = with lib; { + description = "Python module to interact with Garmin Connect"; + homepage = "https://github.com/cyberjunky/python-garminconnect-aio"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 1abd9648e95..f69f140017e 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -24,10 +24,6 @@ buildPythonPackage rec { sha256 = "sha256-eQdbAQRKqnJGxnSTkk3gld9TX9MpP3J8LFNYH6peVIY="; }; - postPatch = '' - sed -i 's/"acme.*"/"acme"/' setup.py - ''; - propagatedBuildInputs = [ acme aiohttp @@ -44,11 +40,17 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + sed -i 's/"acme.*"/"acme"/' setup.py + substituteInPlace setup.py \ + --replace "snitun==" "snitun>=" + ''; + pythonImportsCheck = [ "hass_nabucasa" ]; meta = with lib; { homepage = "https://github.com/NabuCasa/hass-nabucasa"; - description = "Home Assistant cloud integration by Nabu Casa, inc."; + description = "Python module for the Home Assistant cloud integration"; license = licenses.gpl3Only; maintainers = with maintainers; [ Scriptkiddi ]; }; diff --git a/pkgs/development/python-modules/ms-cv/default.nix b/pkgs/development/python-modules/ms-cv/default.nix new file mode 100644 index 00000000000..aa8e361338d --- /dev/null +++ b/pkgs/development/python-modules/ms-cv/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ms-cv"; + version = "0.1.1"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "OpenXbox"; + repo = "ms_cv"; + rev = "v${version}"; + sha256 = "0pkna0kvmq1cp4rx3dnzxsvvlxxngryp77k42wkyw2phv19a2mjd"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Correlation vector implementation in python"; + homepage = "https://github.com/OpenXbox/ms_cv"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix new file mode 100644 index 00000000000..9cf8618bb30 --- /dev/null +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -0,0 +1,50 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-error-for-skips +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "nettigo-air-monitor"; + version = "0.2.6"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "bieniu"; + repo = pname; + rev = version; + sha256 = "0zs14g02m1ahyrhl2ihk74fp390g4672r1jjiaawmkxrvib07dvp"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytest-error-for-skips + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + substituteInPlace setup.cfg \ + --replace "--cov --cov-report term-missing " "" + ''; + + pythonImportsCheck = [ "nettigo_air_monitor" ]; + + meta = with lib; { + description = "Python module to get air quality data from Nettigo Air Monitor devices"; + homepage = "https://github.com/bieniu/nettigo-air-monitor"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyads/default.nix b/pkgs/development/python-modules/pyads/default.nix index 37d3b31a365..5b710b0da15 100644 --- a/pkgs/development/python-modules/pyads/default.nix +++ b/pkgs/development/python-modules/pyads/default.nix @@ -1,25 +1,37 @@ -{ adslib, buildPythonPackage, fetchFromGitHub, lib, pytestCheckHook, pytest -, pytestcov, pythonOlder }: +{ lib +, adslib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "pyads"; - version = "3.2.2"; - + version = "3.3.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "stlehmann"; repo = pname; rev = version; - sha256 = "1jd727pw0z73y4xhrykqkfcz1acrpy3rks58lr1y4yilfv11p6jb"; + sha256 = "sha256-h3c6z+dmrOc1Q7E8YVJZJD2FsxoxqQX5J92SEweIpto="; }; - buildInputs = [ adslib ]; + buildInputs = [ + adslib + ]; + patchPhase = '' substituteInPlace pyads/pyads_ex.py \ --replace "ctypes.CDLL(adslib)" "ctypes.CDLL(\"${adslib}/lib/adslib.so\")" ''; - checkInputs = [ pytestCheckHook pytest pytestcov ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyads" ]; meta = with lib; { description = "Python wrapper for TwinCAT ADS library"; diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix new file mode 100644 index 00000000000..c7a8599a048 --- /dev/null +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sqlalchemy +, boto3 +, botocore +, pandas +, tenacity +}: + +buildPythonPackage rec { + pname = "pyathena"; + version = "2.3.0"; + + src = fetchPypi { + pname = "PyAthena"; + inherit version; + sha256 = "08fl653yayvqi991zvcai5ifcxwy9ip6xh0cr3lbimggjnjgwsl5"; + }; + + # Nearly all tests depend on a working AWS Athena instance, + # therefore deactivating them. + # https://github.com/laughingman7743/PyAthena/#testing + doCheck = false; + + propagatedBuildInputs = [ + boto3 + botocore + pandas + tenacity + ]; + + meta = with lib; { + homepage = "https://github.com/laughingman7743/PyAthena/"; + license = licenses.mit; + description = "Python DB API 2.0 (PEP 249) client for Amazon Athena"; + maintainers = with maintainers; [ turion ]; + }; +} diff --git a/pkgs/development/python-modules/pykulersky/default.nix b/pkgs/development/python-modules/pykulersky/default.nix new file mode 100644 index 00000000000..1afa50c9be3 --- /dev/null +++ b/pkgs/development/python-modules/pykulersky/default.nix @@ -0,0 +1,43 @@ +{ lib +, bleak +, buildPythonPackage +, click +, fetchFromGitHub +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pykulersky"; + version = "0.5.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "emlove"; + repo = pname; + rev = version; + sha256 = "1fzfixnl28rny7c3wr6gcdpqhyrz7z2aqq6qfwkxnkq2kqdbpmmg"; + }; + + propagatedBuildInputs = [ + bleak + click + ]; + + checkInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "pykulersky" ]; + + meta = with lib; { + description = "Python module to control Brightech Kuler Sky Bluetooth LED devices"; + homepage = "https://github.com/emlove/pykulersky"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix new file mode 100644 index 00000000000..6710d3d286e --- /dev/null +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pyaes +, pysocks +, async-lru +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "pyrogram"; + version = "1.2.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "pyrogram"; + repo = "pyrogram"; + rev = "v${version}"; + sha256 = "0clbnhk1icr4vl29693r6r28f5by5n6pjxjqih21g3yd64q55q3q"; + }; + + propagatedBuildInputs = [ + pyaes + pysocks + async-lru + ]; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "pyrogram" + "pyrogram.errors" + "pyrogram.types" + ]; + + meta = with lib; { + description = "Telegram MTProto API Client Library and Framework for Python"; + homepage = "https://github.com/pyrogram/pyrogram"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index cb03d73b427..0df6419b526 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, appdirs, explorerscript, ndspy, pillow, setuptools, skytemple-rust, tilequant }: +{ lib, buildPythonPackage, fetchFromGitHub, appdirs, explorerscript, ndspy, pillow, setuptools, skytemple-rust, tilequant, armips, fetchpatch }: buildPythonPackage rec { pname = "skytemple-files"; @@ -8,9 +8,26 @@ buildPythonPackage rec { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "1vklg4kcj3kb9ryrzrcmywn131b2bp3vy94cd4x4y4s7hkhgwg74"; + sha256 = "sha256-/S0otBujwO/IMiLKgA2o8wlD6xk1/DpwOAfemojV9NU="; + fetchSubmodules = true; }; + patches = [ + # fix patching https://github.com/SkyTemple/skytemple-files/pull/128 + # merged, remove for next update + (fetchpatch { + url = "http://github.com/SkyTemple/skytemple-files/commit/71dd71e6abb7435405e30225e8a37592b990d692.patch"; + sha256 = "sha256-CSBaT+LVP9J0C1FlUCduTJroq9z2EAJG6lruvlHlQLI="; + }) + ]; + + postPatch = '' + substituteInPlace skytemple_files/patch/arm_patcher.py \ + --replace "exec_name = os.getenv('SKYTEMPLE_ARMIPS_EXEC', f'{prefix}armips')" "exec_name = \"${armips}/bin/armips\"" + ''; + + buildInputs = [ armips ]; + propagatedBuildInputs = [ appdirs explorerscript ndspy pillow setuptools skytemple-rust tilequant ]; doCheck = false; # requires Pokémon Mystery Dungeon ROM @@ -20,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/skytemple-files"; description = "Python library to edit the ROM of Pokémon Mystery Dungeon Explorers of Sky"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ xfix marius851000 ]; }; } diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index f93445a02b0..f09876eadb1 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -1,21 +1,35 @@ -{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub -, attrs, cryptography, async-timeout, pytest-aiohttp, pytestCheckHook +{ lib +, stdenv +, async-timeout +, attrs +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pytest-aiohttp +, pytestCheckHook }: buildPythonPackage rec { pname = "snitun"; - version = "0.21.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "NabuCasa"; repo = pname; rev = version; - sha256 = "sha256-oZHi/H9HOqGTFuhqPSZXntMzVJ3ZT4zNejezo0cDtqg="; + sha256 = "sha256-vx9F+Nat69Yadd+YpsnBCstnxCEICFJI14TdG6PvstI="; }; - propagatedBuildInputs = [ attrs cryptography async-timeout ]; + propagatedBuildInputs = [ + async-timeout + attrs + cryptography + ]; - checkInputs = [ pytestCheckHook pytest-aiohttp ]; + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; disabledTests = lib.optionals stdenv.isDarwin [ "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61 @@ -26,10 +40,13 @@ buildPythonPackage rec { "test_peer_listener_timeout" ]; + pythonImportsCheck = [ "snitun" ]; + meta = with lib; { homepage = "https://github.com/nabucasa/snitun"; description = "SNI proxy with TCP multiplexer"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ Scriptkiddi ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index 90ba99fe0ac..0681218cd0a 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -8,11 +8,13 @@ , pytestCheckHook , pytest-check , markdown +, testVersion +, staticjinja }: buildPythonPackage rec { pname = "staticjinja"; - version = "2.0.1"; + version = "2.1.0"; format = "pyproject"; # No tests in pypi @@ -20,7 +22,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "sha256-sGon3+So4EuVRTUqcP9omfJ91wBzJSm7CSkuefX3S+8="; + sha256 = "sha256-VKsDvWEurBdckWbPG5hQLK3dzdM7XVbrp23fR5wp1xk="; }; nativeBuildInputs = [ @@ -44,6 +46,10 @@ buildPythonPackage rec { export PATH="$PATH:$out/bin"; ''; + passthru.tests.version = testVersion { + package = staticjinja; + }; + meta = with lib; { description = "A library and cli tool that makes it easy to build static sites using Jinja2"; homepage = "https://staticjinja.readthedocs.io/en/latest/"; diff --git a/pkgs/development/python-modules/tgcrypto/default.nix b/pkgs/development/python-modules/tgcrypto/default.nix new file mode 100644 index 00000000000..7fd62d7bcbe --- /dev/null +++ b/pkgs/development/python-modules/tgcrypto/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tgcrypto"; + version = "1.2.2"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "pyrogram"; + repo = "tgcrypto"; + rev = "v${version}"; + sha256 = "1vyjycjb2n790371kf47qc0mkvd4bxmhh65cfxjsrcjpiri7shjf"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "tgcrypto" ]; + + meta = with lib; { + description = "Fast and Portable Telegram Crypto Library for Python"; + homepage = "https://github.com/pyrogram/tgcrypto"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index eb720c7f206..1dd80b52d19 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , fetchpatch -, isPy27 +, pythonOlder , click , click-log , click-threading @@ -18,21 +18,23 @@ }: buildPythonPackage rec { - version = "0.16.8"; + version = "0.18.0"; pname = "vdirsyncer"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "bfdb422f52e1d4d60bd0635d203fb59fa7f613397d079661eb48e79464ba13c5"; + sha256 = "sha256-J7w+1R93STX7ujkpFcjI1M9jmuUaRLZ0aGtJoQJfwgE="; }; propagatedBuildInputs = [ - click click-log click-threading - requests_toolbelt + atomicwrites + click + click-log + click-threading requests requests_oauthlib # required for google oauth sync - atomicwrites + requests_toolbelt ]; nativeBuildInputs = [ @@ -46,16 +48,8 @@ buildPythonPackage rec { pytest-subtesthack ]; - patches = [ - (fetchpatch { - name = "update-usage-deprecated-method.patch"; - url = "https://github.com/pimutils/vdirsyncer/commit/7577fa21177442aacc2d86640ef28cebf1c4aaef.patch"; - sha256 = "0inkr1wfal20kssij8l5myhpjivxg8wlvhppqc3lvml9d1i75qbh"; - }) - ]; - postPatch = '' - substituteInPlace setup.py --replace "click>=5.0,<6.0" "click" + sed -i -e '/--cov/d' -e '/--no-cov/d' setup.cfg ''; preCheck = '' @@ -63,8 +57,9 @@ buildPythonPackage rec { ''; disabledTests = [ - "test_verbosity" "test_create_collections" # Flaky test exceeds deadline on hydra: https://github.com/pimutils/vdirsyncer/issues/837 + "test_request_ssl" + "test_verbosity" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index 373e7a0a220..14cac499883 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -1,7 +1,9 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , buildPythonPackage +, libiconv }: let pname = "wasmer"; @@ -26,6 +28,8 @@ in buildPythonPackage rec { nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildAndTestSubdir = "packages/api"; doCheck = false; diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 92dbc210c6d..973393a8932 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , aiohttp , backoff +, poetry-core , packaging , yarl , aresponses @@ -13,16 +14,21 @@ buildPythonPackage rec { pname = "wled"; - version = "0.4.4"; - disabled = pythonOlder "3.7"; + version = "0.5.0"; + disabled = pythonOlder "3.8"; + format = "pyproject"; src = fetchFromGitHub { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "1adh23v4c9kia3ddqdq0brksd5rhgh4ff7l5hil8klx4dmkrjfz3"; + sha256 = "123806fmdihdf9y8dqp5rli5c4i9a74j9rmhay8m68igm1326d5f"; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp backoff @@ -36,6 +42,13 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + pythonImportsCheck = [ "wled" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/xbox-webapi/default.nix b/pkgs/development/python-modules/xbox-webapi/default.nix new file mode 100644 index 00000000000..b16a87e2fd6 --- /dev/null +++ b/pkgs/development/python-modules/xbox-webapi/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, appdirs +, ecdsa +, ms-cv +, pydantic +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "xbox-webapi"; + version = "2.0.11"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "OpenXbox"; + repo = "xbox-webapi-python"; + rev = "v${version}"; + sha256 = "0li0bq914xizx9fj49s1iwfrv4bpzvl74bwsi5a34r9yizw02cvz"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + + propagatedBuildInputs = [ + aiohttp + appdirs + ecdsa + ms-cv + pydantic + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + meta = with lib; { + description = "Library to authenticate with Windows Live/Xbox Live and use their API"; + homepage = "https://github.com/OpenXbox/xbox-webapi-python"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix new file mode 100644 index 00000000000..884c0edfb73 --- /dev/null +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -0,0 +1,40 @@ +{ rustPlatform +, fetchFromGitHub +, lib +, openssl +, file +, rpm +, pkg-config +, stdenv +, curl +, Security +, runCommand +}: +rustPlatform.buildRustPackage rec { + pname = "sentry-cli"; + version = "1.66.0"; + + src = fetchFromGitHub { + owner = "getsentry"; + repo = "sentry-cli"; + rev = version; + sha256 = "sha256-ivQBn5GGb64Jq0gpywAg20309QQMpasg/Bu5sHKj02Y="; + }; + doCheck = false; + + # Needed to get openssl-sys to use pkgconfig. + OPENSSL_NO_VENDOR = 1; + + buildInputs = [ openssl file rpm ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; + nativeBuildInputs = [ pkg-config ]; + + cargoSha256 = "sha256-xS88KZWYkg3v8TJZUVVgQhR++CrZGD0DQnLPktSUJQk="; + + meta = with lib; { + homepage = "https://docs.sentry.io/cli/"; + license = licenses.bsd3; + description = "A command line utility to work with Sentry."; + maintainers = with maintainers; [ rizary ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix new file mode 100644 index 00000000000..56c57483ddc --- /dev/null +++ b/pkgs/development/tools/stylua/default.nix @@ -0,0 +1,35 @@ +{ fetchFromGitHub +, lib +, rustPlatform +, stdenvNoCC +, lua52Support ? true +, luauSupport ? false +}: + +rustPlatform.buildRustPackage rec { + pname = "stylua"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "johnnymorganz"; + repo = pname; + rev = "v${version}"; + sha256 = "0gjm9pvwfbwhd49pm5sw5plwhlhvbfkms44h67zgvy7xzqv8h3dw"; + }; + + cargoSha256 = "117m78naldp6yvwcccvsrbnx6x6287cvq0saa06pmiqv1rqm50m3"; + + cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ] + ++ lib.optionals luauSupport [ "--features" "luau" ]; + + # test_standard fails on darwin + doCheck = !stdenvNoCC.isDarwin; + + meta = with lib; { + description = "An opinionated Lua code formatter"; + homepage = "https://github.com/johnnymorganz/stylua"; + changelog = "https://github.com/johnnymorganz/stylua/blob/v${version}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index e0412b0dd36..262ddc5d721 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.222"; + version = "0.0.223"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-yFcsbk5CAOqnT1ljOe+lGfEj1sCBsaFNZnfcQOfezs4="; + sha256 = "sha256-HDxFjEXQ33U2SiRz/e6vurZo710ibArdGLZcLoou17I="; }; preBuild = '' diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/games/rpg-cli/default.nix index 1c5e8fce97a..6a4e27d8691 100644 --- a/pkgs/games/rpg-cli/default.nix +++ b/pkgs/games/rpg-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rpg-cli"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "facundoolano"; repo = pname; rev = version; - sha256 = "0rbj27zd7ydkvnyszd56hazj64aqqrwn34fsy4jymk50lvicwxjg"; + sha256 = "07ar7almaz005jch7zm63kxyxvk3bphi2gl88xsb2rk5srkbb2s2"; }; - cargoSha256 = "sha256-VftJgRqrFwTElp2/e+zQYZOLZPjbc9C8SZ4DlBEtRvQ="; + cargoSha256 = "sha256-wJPRI3jfV+v/XpIU9+j1jXlyfjkFCEHZdFJx/KMNT9o="; # tests assume the authors macbook, and thus fail doCheck = false; diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index 35db4625db9..6bbdc42d9f2 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchzip, fetchurl, fetchFromGitHub, buildFHSUserEnv -, runCommandNoCC, makeDesktopItem, copyDesktopItems, gcc, cmake, gmp -, libGL, zlib, ncurses, geoip, lua5, nettle, curl, SDL2, freetype, glew -, openal, libopus, opusfile, libogg, libvorbis, libjpeg, libwebp, libpng +{ lib, stdenv, fetchzip, fetchFromGitHub, buildFHSUserEnv, makeDesktopItem +, copyDesktopItems, gcc, cmake, gmp , libGL, zlib, ncurses, geoip, lua5 +, nettle, curl, SDL2, freetype, glew , openal, libopus, opusfile, libogg +, libvorbis, libjpeg, libwebp, libpng , cacert, aria2 # to download assets }: @@ -127,6 +127,7 @@ in stdenv.mkDerivation rec { "-DBUILD_SGAME=NO" "-DUSE_HARDENING=TRUE" "-DUSE_LTO=TRUE" + "-DOpenGL_GL_PREFERENCE=LEGACY" # https://github.com/DaemonEngine/Daemon/issues/474 ]; desktopItems = [ diff --git a/pkgs/misc/cups/drivers/kyocera-ecosys-m552x-p502x/default.nix b/pkgs/misc/cups/drivers/kyocera-ecosys-m552x-p502x/default.nix new file mode 100644 index 00000000000..66e3d036bcc --- /dev/null +++ b/pkgs/misc/cups/drivers/kyocera-ecosys-m552x-p502x/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, lib +, fetchzip + # can either be "EU" or "Global"; it's unclear what the difference is +, region ? "Global" +}: + +stdenv.mkDerivation rec { + pname = "cups-kyocera-ecosys-m552x-p502x"; + version = "8.1602"; + + src = fetchzip { + url = "https://www.kyoceradocumentsolutions.de/content/download-center/de/drivers/all/Linux_8_1602_ECOSYS_M5521_5526_P5021_5026_zip.download.zip"; + sha256 = "sha256-XDH5deZmWNghfoO7JaYYvnVq++mbQ8RwLY57L2CKYaY="; + }; + + installPhase = '' + mkdir -p $out/share/cups/model/Kyocera + cp ${region}/English/*.PPD $out/share/cups/model/Kyocera/ + ''; + + meta = with lib; { + description = "PPD files for Kyocera ECOSYS M5521cdn/M5521cdw/M5526cdn/M5526cdw/P5021cdn/P5021cdw/P5026cdn/P5026cdw"; + homepage = "https://www.kyoceradocumentsolutions.com"; + license = licenses.unfree; + maintainers = [ maintainers.mbrgm ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/darwin/mas/default.nix b/pkgs/os-specific/darwin/mas/default.nix index 15de553b76b..907d2185327 100644 --- a/pkgs/os-specific/darwin/mas/default.nix +++ b/pkgs/os-specific/darwin/mas/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { bsdtar -xf Payload~ ''; - doBuild = false; + dontBuild = true; installPhase = '' mkdir -p $out diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index aa8988fae8e..fafa0e53810 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.12.8"; + version = "5.12.10"; suffix = "xanmod1-cacule"; in buildLinux (args // rec { @@ -12,16 +12,13 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-i3exBrEKyTHM2Iq8AJEIHwaw6KJarfcahlm/pPxAhmo="; - extraPostFetch = '' - rm $out/.config - ''; + sha256 = "sha256-DxWkknL8kgFmdI+jb5chVnWCz6oDKOw6iuT69zDaDNs="; }; extraMeta = { branch = "5.12-cacule"; maintainers = with lib.maintainers; [ fortuneteller2k ]; description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience"; - broken = stdenv.hostPlatform.isAarch64; + broken = stdenv.isAarch64; }; } // (args.argsOverride or { })) diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index 26060150df0..b4926e75b52 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { pname = "corosync"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-UlwF1DmWh52yJ4c9SbpaoVaV/L65r4dQ238M3/+Esps="; + sha256 = "sha256-sxoYlAi5RJCQcg0bSqO23t9nTkuuzOeLWPa/dLZZzuo="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f7f5f589f62..ddc4a81cec9 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -293,7 +293,7 @@ "futurenow" = ps: with ps; [ pyfnip ]; "garadget" = ps: with ps; [ ]; "garages_amsterdam" = ps: with ps; [ garages-amsterdam ]; - "garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect_aio + "garmin_connect" = ps: with ps; [ garminconnect-aio ]; "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 "gdacs" = ps: with ps; [ aio-georss-gdacs ]; "generic" = ps: with ps; [ ]; @@ -303,8 +303,8 @@ "geo_location" = ps: with ps; [ ]; "geo_rss_events" = ps: with ps; [ georss-generic-client ]; "geofency" = ps: with ps; [ aiohttp-cors ]; - "geonetnz_quakes" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_quakes - "geonetnz_volcano" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_volcano + "geonetnz_quakes" = ps: with ps; [ aio-geojson-geonetnz-quakes ]; + "geonetnz_volcano" = ps: with ps; [ aio-geojson-geonetnz-volcano ]; "gios" = ps: with ps; [ gios ]; "github" = ps: with ps; [ PyGithub ]; "gitlab_ci" = ps: with ps; [ python-gitlab ]; @@ -433,7 +433,7 @@ "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected "kostal_plenticore" = ps: with ps; [ ]; # missing inputs: kostal_plenticore "kraken" = ps: with ps; [ ]; # missing inputs: krakenex pykrakenapi - "kulersky" = ps: with ps; [ ]; # missing inputs: pykulersky + "kulersky" = ps: with ps; [ pykulersky ]; "kwb" = ps: with ps; [ ]; # missing inputs: pykwb "lacrosse" = ps: with ps; [ pylacrosse ]; "lametric" = ps: with ps; [ ]; # missing inputs: lmnotify @@ -544,7 +544,7 @@ "mystrom" = ps: with ps; [ aiohttp-cors python-mystrom ]; "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns "nad" = ps: with ps; [ nad-receiver ]; - "nam" = ps: with ps; [ ]; # missing inputs: nettigo-air-monitor + "nam" = ps: with ps; [ nettigo-air-monitor ]; "namecheapdns" = ps: with ps; [ defusedxml ]; "nanoleaf" = ps: with ps; [ pynanoleaf ]; "neato" = ps: with ps; [ aiohttp-cors pybotvac ]; @@ -576,7 +576,7 @@ "notify_events" = ps: with ps; [ ]; # missing inputs: notify-events "notion" = ps: with ps; [ aionotion ]; "nsw_fuel_station" = ps: with ps; [ ]; # missing inputs: nsw-fuel-api-client - "nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents + "nsw_rural_fire_service_feed" = ps: with ps; [ aio-geojson-nsw-rfs-incidents ]; "nuheat" = ps: with ps; [ ]; # missing inputs: nuheat "nuki" = ps: with ps; [ pynuki ]; "numato" = ps: with ps; [ ]; # missing inputs: numato-gpio @@ -967,7 +967,7 @@ "wunderground" = ps: with ps; [ ]; "x10" = ps: with ps; [ ]; "xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper - "xbox" = ps: with ps; [ aiohttp-cors ]; # missing inputs: xbox-webapi + "xbox" = ps: with ps; [ aiohttp-cors xbox-webapi ]; "xbox_live" = ps: with ps; [ xboxapi ]; "xeoma" = ps: with ps; [ pyxeoma ]; "xiaomi" = ps: with ps; [ ha-ffmpeg ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index da3e16b0a20..571f630a593 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -387,11 +387,15 @@ in with py.pkgs; buildPythonApplication rec { "fritzbox" "fritzbox_callmonitor" "frontend" + "garmin_connect" "generic" "generic_thermostat" "geo_json_events" "geo_location" + "geo_rss_events" "geofency" + "geonetnz_quakes" + "geonetnz_volcano" "glances" "gios" "gogogate2" @@ -450,6 +454,7 @@ in with py.pkgs; buildPythonApplication rec { "kmtronic" "knx" "kodi" + "kulersky" "lastfm" "lcn" "light" @@ -498,6 +503,7 @@ in with py.pkgs; buildPythonApplication rec { "my" "myq" "mysensors" + "nam" "namecheapdns" "neato" "netatmo" @@ -505,6 +511,7 @@ in with py.pkgs; buildPythonApplication rec { "no_ip" "notify" "notion" + "nsw_rural_fire_service_feed" "nuki" "number" "nws" @@ -673,6 +680,7 @@ in with py.pkgs; buildPythonApplication rec { "worldclock" "wsdot" "wunderground" + "xbox" "xiaomi" "xiaomi_aqara" "xiaomi_miio" diff --git a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix index 50cf5a00164..f5d4f6ca88f 100644 --- a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix +++ b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "alertmanager-irc-relay"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "google"; repo = "alertmanager-irc-relay"; rev = "v${version}"; - sha256 = "sha256-02uEvcxT5+0OJtqOyuQjgkqL0fZnN7umCSxBqAVPT9U="; + sha256 = "sha256-/gZeIJN7xkDe7f+Q7zh16KG6RC+G/9MIPm3KQManVZ0="; }; vendorSha256 = "sha256-VLG15IXS/fXFMTCJKEqGW6qZ9aOLPhazidVsOywG+w4="; diff --git a/pkgs/servers/roon-bridge/default.nix b/pkgs/servers/roon-bridge/default.nix new file mode 100644 index 00000000000..5b469c1cc9d --- /dev/null +++ b/pkgs/servers/roon-bridge/default.nix @@ -0,0 +1,66 @@ +{ alsa-lib +, alsa-utils +, autoPatchelfHook +, fetchurl +, lib +, makeWrapper +, stdenv +, zlib +}: + +stdenv.mkDerivation rec { + pname = "roon-bridge"; + version = "1.8-795"; + + # N.B. The URL is unstable. I've asked for them to provide a stable URL but + # they have ignored me. If this package fails to build for you, you may need + # to update the version and sha256. + # c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129 + src = fetchurl { + url = "https://web.archive.org/web/20210610172810/http://download.roonlabs.com/builds/RoonBridge_linuxx64.tar.bz2"; + sha256 = "sha256-ahdy0/TBOyMfCt4VTkcDTZGAFmwQJT2KvZuMtFcAY3w="; + }; + + buildInputs = [ + alsa-lib + alsa-utils + zlib + ]; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out + mv * $out + runHook postInstall + ''; + + postFixup = + let + linkFix = bin: '' + sed -i '/ulimit/d' ${bin} + sed -i '/ln -sf/d' ${bin} + ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin} + ''; + wrapFix = bin: '' + wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsa-utils ]} + ''; + in + '' + ${linkFix "$out/Bridge/RAATServer"} + ${linkFix "$out/Bridge/RoonBridge"} + ${linkFix "$out/Bridge/RoonBridgeHelper"} + + ${wrapFix "$out/check.sh"} + ${wrapFix "$out/start.sh"} + ''; + + meta = with lib; { + description = "The music player for music lovers"; + homepage = "https://roonlabs.com"; + license = licenses.unfree; + maintainers = with maintainers; [ lovesegfault ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 706e292732b..ed6108d5148 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -5,6 +5,7 @@ lib.makeScope newScope (self: with self; { inherit pixman; + # THIS IS A GENERATED FILE. DO NOT EDIT! appres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXt }: stdenv.mkDerivation { name = "appres-1.0.5"; builder = ./builder.sh; @@ -18,6 +19,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -31,6 +33,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -44,6 +47,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -57,6 +61,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -70,6 +75,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -84,6 +90,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -98,6 +105,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -112,6 +120,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -126,6 +135,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -140,6 +150,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -153,6 +164,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -167,6 +179,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -181,6 +194,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -195,6 +209,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -209,6 +224,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -223,6 +239,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -237,6 +254,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -251,6 +269,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -265,6 +284,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -279,6 +299,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -293,6 +314,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -307,6 +329,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -321,6 +344,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -335,6 +359,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -349,6 +374,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -363,6 +389,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -377,6 +404,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -391,6 +419,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -405,6 +434,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -419,6 +449,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -433,6 +464,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -447,6 +479,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -461,6 +494,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -475,6 +509,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -489,6 +524,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -503,6 +539,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -517,6 +554,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -531,6 +569,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -544,6 +583,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -557,6 +597,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -571,6 +612,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -585,6 +627,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -598,6 +641,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -611,6 +655,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -624,6 +669,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -637,6 +683,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -650,6 +697,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -663,6 +711,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -676,6 +725,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -689,6 +739,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -702,6 +753,7 @@ lib.makeScope newScope (self: with self; { 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.1"; builder = ./builder.sh; @@ -715,6 +767,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -728,6 +781,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -741,6 +795,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -754,6 +809,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -767,6 +823,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -780,6 +837,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -793,6 +851,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -806,6 +865,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -819,6 +879,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -832,6 +893,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -845,6 +907,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -858,6 +921,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -871,6 +935,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -884,6 +949,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -897,6 +963,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -910,6 +977,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -923,6 +991,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -936,6 +1005,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -949,6 +1019,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -962,6 +1033,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -975,6 +1047,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -988,6 +1061,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1001,6 +1075,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1014,6 +1089,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1027,6 +1103,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1040,6 +1117,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1053,6 +1131,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1066,6 +1145,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1079,6 +1159,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1092,6 +1173,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1105,6 +1187,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1118,6 +1201,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1131,6 +1215,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1144,6 +1229,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1157,6 +1243,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1170,6 +1257,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1183,6 +1271,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1196,6 +1285,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1209,6 +1299,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1222,6 +1313,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1235,6 +1327,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1248,6 +1341,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1261,6 +1355,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1274,6 +1369,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1287,6 +1383,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1300,6 +1397,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1313,6 +1411,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1326,6 +1425,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1339,6 +1439,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1352,6 +1453,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1365,6 +1467,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1378,6 +1481,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1391,6 +1495,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1404,6 +1509,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1417,6 +1523,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1430,6 +1537,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1443,6 +1551,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1456,6 +1565,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1469,6 +1579,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1482,6 +1593,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1495,6 +1607,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1508,6 +1621,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1521,6 +1635,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1534,6 +1649,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1547,6 +1663,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1560,6 +1677,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1573,6 +1691,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1586,6 +1705,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1599,6 +1719,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1612,6 +1733,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1625,6 +1747,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1638,6 +1761,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1651,6 +1775,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1664,6 +1789,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1677,6 +1803,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1690,6 +1817,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1703,6 +1831,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1716,6 +1845,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1729,6 +1859,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1742,6 +1873,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1755,6 +1887,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1768,6 +1901,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1781,6 +1915,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1794,6 +1929,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1807,6 +1943,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1820,6 +1957,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1833,6 +1971,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1846,6 +1985,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1859,6 +1999,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1872,6 +2013,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1885,6 +2027,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1898,6 +2041,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1911,6 +2055,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1924,6 +2069,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1937,6 +2083,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1950,6 +2097,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1963,6 +2111,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1976,6 +2125,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -1989,6 +2139,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2002,6 +2153,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2015,6 +2167,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2028,6 +2181,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2041,6 +2195,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2054,6 +2209,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2067,6 +2223,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2080,6 +2237,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2093,6 +2251,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2106,6 +2265,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2119,6 +2279,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2132,6 +2293,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2145,6 +2307,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2158,6 +2321,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2171,6 +2335,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2184,6 +2349,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2197,6 +2363,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2210,6 +2377,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2223,6 +2391,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2236,6 +2405,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2249,6 +2419,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2262,6 +2433,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2275,6 +2447,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2288,6 +2461,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2301,6 +2475,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2314,6 +2489,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2327,6 +2503,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2340,6 +2517,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2353,6 +2531,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2366,6 +2545,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2379,6 +2559,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2392,6 +2573,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2405,6 +2587,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2418,6 +2601,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2431,6 +2615,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2444,6 +2629,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2457,6 +2643,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2470,6 +2657,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2483,6 +2671,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2496,6 +2685,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2509,6 +2699,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2522,6 +2713,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2535,6 +2727,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2548,6 +2741,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2561,6 +2755,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2574,6 +2769,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2587,6 +2783,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2600,6 +2797,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2613,6 +2811,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2626,6 +2825,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2639,6 +2839,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2652,6 +2853,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2665,6 +2867,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2678,6 +2881,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2691,6 +2895,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2704,6 +2909,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2717,6 +2923,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2730,6 +2937,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2743,6 +2951,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2756,6 +2965,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2769,6 +2979,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2782,6 +2993,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2795,6 +3007,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2808,6 +3021,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2821,6 +3035,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2834,6 +3049,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2847,6 +3063,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2860,6 +3077,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2873,6 +3091,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2886,6 +3105,7 @@ lib.makeScope newScope (self: with self; { 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; @@ -2899,6 +3119,7 @@ lib.makeScope newScope (self: with self; { 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; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index b50f3f33a31..6ec75517147 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -301,6 +301,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { } print OUT <