mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
6bab4adaae
@ -13240,6 +13240,12 @@
|
||||
githubId = 19905904;
|
||||
name = "Simon Weber";
|
||||
};
|
||||
sweenu = {
|
||||
name = "sweenu";
|
||||
email = "contact@sweenu.xyz";
|
||||
github = "sweenu";
|
||||
githubId = 7051978;
|
||||
};
|
||||
swflint = {
|
||||
email = "swflint@flintfam.org";
|
||||
github = "swflint";
|
||||
|
||||
@ -1396,6 +1396,16 @@ signald -d /var/lib/signald/db \
|
||||
for those who want to use it.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
A NixOS module for Firefox has been added which allows
|
||||
preferences and
|
||||
<link xlink:href="https://github.com/mozilla/policy-templates/blob/master/README.md">policies</link>
|
||||
to be set. This also allows extensions to be installed via the
|
||||
<literal>ExtensionSettings</literal> policy. The new options
|
||||
are under <literal>programs.firefox</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
@ -422,4 +422,6 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
||||
|
||||
- The `mame` package does not ship with its tools anymore in the default output. They were moved to a separate `tools` output instead. For convenience, `mame-tools` package was added for those who want to use it.
|
||||
|
||||
- A NixOS module for Firefox has been added which allows preferences and [policies](https://github.com/mozilla/policy-templates/blob/master/README.md) to be set. This also allows extensions to be installed via the `ExtensionSettings` policy. The new options are under `programs.firefox`.
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
@ -157,6 +157,7 @@
|
||||
./programs/extra-container.nix
|
||||
./programs/feedbackd.nix
|
||||
./programs/file-roller.nix
|
||||
./programs/firefox.nix
|
||||
./programs/firejail.nix
|
||||
./programs/fish.nix
|
||||
./programs/flashrom.nix
|
||||
|
||||
91
nixos/modules/programs/firefox.nix
Normal file
91
nixos/modules/programs/firefox.nix
Normal file
@ -0,0 +1,91 @@
|
||||
{ pkgs, config, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.programs.firefox;
|
||||
|
||||
policyFormat = pkgs.formats.json { };
|
||||
|
||||
organisationInfo = ''
|
||||
When this option is in use, Firefox will inform you that "your browser
|
||||
is managed by your organisation". That message appears because NixOS
|
||||
installs what you have declared here such that it cannot be overridden
|
||||
through the user interface. It does not mean that someone else has been
|
||||
given control of your browser, unless of course they also control your
|
||||
NixOS configuration.
|
||||
'';
|
||||
|
||||
in {
|
||||
options.programs.firefox = {
|
||||
enable = mkEnableOption (mdDoc "the Firefox web browser");
|
||||
|
||||
package = mkOption {
|
||||
description = mdDoc "Firefox package to use.";
|
||||
type = types.package;
|
||||
default = pkgs.firefox;
|
||||
defaultText = literalExpression "pkgs.firefox";
|
||||
relatedPackages = [
|
||||
"firefox"
|
||||
"firefox-beta-bin"
|
||||
"firefox-bin"
|
||||
"firefox-devedition-bin"
|
||||
"firefox-esr"
|
||||
"firefox-esr-wayland"
|
||||
"firefox-wayland"
|
||||
];
|
||||
};
|
||||
|
||||
policies = mkOption {
|
||||
description = mdDoc ''
|
||||
Group policies to install.
|
||||
|
||||
See [Mozilla's documentation](https://github.com/mozilla/policy-templates/blob/master/README.md")
|
||||
for a list of available options.
|
||||
|
||||
This can be used to install extensions declaratively! Check out the
|
||||
documentation of the `ExtensionSettings` policy for details.
|
||||
|
||||
${organisationInfo}
|
||||
'';
|
||||
type = policyFormat.type;
|
||||
default = {};
|
||||
};
|
||||
|
||||
preferences = mkOption {
|
||||
description = mdDoc ''
|
||||
Preferences to set from `about://config`.
|
||||
|
||||
Some of these might be able to be configured more ergonomically
|
||||
using policies.
|
||||
|
||||
${organisationInfo}
|
||||
'';
|
||||
type = with types; attrsOf (oneOf [ bool int string ]);
|
||||
default = {};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
environment.etc."firefox/policies/policies.json".source =
|
||||
let policiesJSON =
|
||||
policyFormat.generate
|
||||
"firefox-policies.json"
|
||||
{ inherit (cfg) policies; };
|
||||
in mkIf (cfg.policies != {}) "${policiesJSON}";
|
||||
|
||||
# Preferences are converted into a policy
|
||||
programs.firefox.policies =
|
||||
mkIf (cfg.preferences != {})
|
||||
{
|
||||
Preferences = (mapAttrs (name: value: {
|
||||
Value = value;
|
||||
Status = "locked";
|
||||
}) cfg.preferences);
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ danth ];
|
||||
}
|
||||
@ -77,6 +77,7 @@ let
|
||||
"varnish"
|
||||
"wireguard"
|
||||
"flow"
|
||||
"zfs"
|
||||
] (name:
|
||||
import (./. + "/exporters/${name}.nix") { inherit config lib pkgs options; }
|
||||
);
|
||||
@ -196,7 +197,7 @@ let
|
||||
serviceConfig.LockPersonality = true;
|
||||
serviceConfig.MemoryDenyWriteExecute = true;
|
||||
serviceConfig.NoNewPrivileges = true;
|
||||
serviceConfig.PrivateDevices = true;
|
||||
serviceConfig.PrivateDevices = mkDefault true;
|
||||
serviceConfig.ProtectClock = mkDefault true;
|
||||
serviceConfig.ProtectControlGroups = true;
|
||||
serviceConfig.ProtectHome = true;
|
||||
|
||||
@ -13,6 +13,7 @@ let
|
||||
http_listen = "${cfg.listenAddress}:${toString cfg.port}";
|
||||
report_errors = cfg.log.prometheusErrors;
|
||||
};
|
||||
inherit (cfg) loki;
|
||||
});
|
||||
|
||||
in {
|
||||
@ -20,6 +21,7 @@ in {
|
||||
|
||||
extraOpts = {
|
||||
inherit (options.services.unifi-poller.unifi) controllers;
|
||||
inherit (options.services.unifi-poller) loki;
|
||||
log = {
|
||||
debug = mkEnableOption (lib.mdDoc "debug logging including line numbers, high resolution timestamps, per-device logs.");
|
||||
quiet = mkEnableOption (lib.mdDoc "startup and error logs only.");
|
||||
|
||||
@ -0,0 +1,44 @@
|
||||
{ config, lib, pkgs, options }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.zfs;
|
||||
in
|
||||
{
|
||||
port = 9134;
|
||||
|
||||
extraOpts = {
|
||||
telemetryPath = mkOption {
|
||||
type = types.str;
|
||||
default = "/metrics";
|
||||
description = lib.mdDoc ''
|
||||
Path under which to expose metrics.
|
||||
'';
|
||||
};
|
||||
|
||||
pools = mkOption {
|
||||
type = with types; nullOr (listOf str);
|
||||
default = [ ];
|
||||
description = lib.mdDoc ''
|
||||
Name of the pool(s) to collect, repeat for multiple pools (default: all pools).
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
serviceOpts = {
|
||||
# needs zpool
|
||||
path = [ config.boot.zfs.package ];
|
||||
serviceConfig = {
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-zfs-exporter}/bin/zfs_exporter \
|
||||
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
|
||||
--web.telemetry-path ${cfg.telemetryPath} \
|
||||
${concatMapStringsSep " " (x: "--pool=${x}") cfg.pools} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
ProtectClock = false;
|
||||
PrivateDevices = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -1396,6 +1396,22 @@ let
|
||||
)
|
||||
'';
|
||||
};
|
||||
|
||||
zfs = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
};
|
||||
metricProvider = {
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
networking.hostId = "7327ded7";
|
||||
};
|
||||
exporterTest = ''
|
||||
wait_for_unit("prometheus-zfs-exporter.service")
|
||||
wait_for_unit("zfs.target")
|
||||
wait_for_open_port(9134)
|
||||
wait_until_succeeds("curl -f localhost:9134/metrics | grep 'zfs_scrape_collector_success{.*} 1'")
|
||||
'';
|
||||
};
|
||||
};
|
||||
in
|
||||
mapAttrs
|
||||
|
||||
@ -46,22 +46,22 @@ in rec {
|
||||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the SHA256 for staging as well.
|
||||
version = "7.17";
|
||||
version = "7.20";
|
||||
url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz";
|
||||
sha256 = "sha256-JDa4rFDWKPTKOsUwDBgmY9/PpIuhulVIp3KOtmH7T0E=";
|
||||
sha256 = "sha256-dRt58itan3LJ7BX3VbALE9PtBz6RaMPvStq9nbN9DVA=";
|
||||
inherit (stable) gecko32 gecko64 patches;
|
||||
|
||||
mono = fetchurl rec {
|
||||
version = "7.3.0";
|
||||
version = "7.4.0";
|
||||
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
|
||||
sha256 = "sha256-k54vVmlyDQ0Px+MFQmYioRozt644XE1+WB4p6iZOIv8=";
|
||||
sha256 = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw=";
|
||||
};
|
||||
};
|
||||
|
||||
staging = fetchFromGitHub rec {
|
||||
# https://github.com/wine-staging/wine-staging/releases
|
||||
inherit (unstable) version;
|
||||
sha256 = "sha256-eC5nYX6Cjutd30rrAn6SavWlQtF8swMHDzsESN4SUmo=";
|
||||
sha256 = "sha256-yzZE06FBoPL65+m8MrKlmW5cSIcX3dZYAOY9wjEJaJw=";
|
||||
owner = "wine-staging";
|
||||
repo = "wine-staging";
|
||||
rev = "v${version}";
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vkd3d";
|
||||
version = "1.4";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz";
|
||||
sha256 = "sha256-yLqF9gSCyHPAVs9tuw6veRvIq30W1ipH83uYQbapCr0=";
|
||||
sha256 = "sha256-47PDVfRvfL/BnnEKR4vLK+4mel82Dn5kBiOM6lLOLPw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flex bison ];
|
||||
|
||||
@ -112,13 +112,13 @@
|
||||
"version": "2.24.1"
|
||||
},
|
||||
"aws": {
|
||||
"hash": "sha256-TQzVuqUhAfEqzCcxA5l993ww9X1dcBeKvddJKzYsBH8=",
|
||||
"hash": "sha256-ZVRzWOw0QwRS931UCJf7gYUZ18SiAEvpkxzCHj/fgQc=",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v4.38.0",
|
||||
"vendorHash": "sha256-6IyBJJV+PRFc8f12fBhtOUjbJdyQYanhsvAxugFf/EE=",
|
||||
"version": "4.38.0"
|
||||
"rev": "v4.39.0",
|
||||
"vendorHash": "sha256-h4J35T9Yl3RfdVIhAFq5lw1eKgvwgg9ir8RuGDFObYQ=",
|
||||
"version": "4.39.0"
|
||||
},
|
||||
"azuread": {
|
||||
"hash": "sha256-mjll5ANx063JLSbqohPOhor3GNeI1MUKgUKQ/f5XFk8=",
|
||||
@ -130,13 +130,13 @@
|
||||
"version": "2.30.0"
|
||||
},
|
||||
"azurerm": {
|
||||
"hash": "sha256-SV5td8GMEpLGLQgbl+1v9F2/hIrXpKsMBfOK+2+jDvk=",
|
||||
"hash": "sha256-7GqKlFFxcxJBFYhTaWGn1VCgn1DiK4aAoiwjIZsa+zI=",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.30.0",
|
||||
"rev": "v3.31.0",
|
||||
"vendorHash": null,
|
||||
"version": "3.30.0"
|
||||
"version": "3.31.0"
|
||||
},
|
||||
"azurestack": {
|
||||
"hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=",
|
||||
@ -194,13 +194,13 @@
|
||||
"version": "0.11.0"
|
||||
},
|
||||
"checkly": {
|
||||
"hash": "sha256-hi6GTToJcKVSpbBBWQN6IREhm8iHFCj+pg71fgZ5rOI=",
|
||||
"hash": "sha256-OKLmcy0egQ9z/eBsdXzGiswByWQ9fiOq4N7ndTW2nso=",
|
||||
"owner": "checkly",
|
||||
"provider-source-address": "registry.terraform.io/checkly/checkly",
|
||||
"repo": "terraform-provider-checkly",
|
||||
"rev": "v1.6.2",
|
||||
"vendorHash": "sha256-VnYRDBneQ+bUzISJM9DJdBEBmjA1WOXPo+kaYBW4w4U=",
|
||||
"version": "1.6.2"
|
||||
"rev": "v1.6.3",
|
||||
"vendorHash": "sha256-63M0cOD5QodGMFK0GrxaJsvVFVHXDS5HdgTv4sOmaBA=",
|
||||
"version": "1.6.3"
|
||||
},
|
||||
"ciscoasa": {
|
||||
"hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=",
|
||||
@ -285,13 +285,13 @@
|
||||
"version": "0.11.0"
|
||||
},
|
||||
"datadog": {
|
||||
"hash": "sha256-GSm1SIWEPdQls3FXkRjvcxZDRjpNAoUQK1zUHvU4tZo=",
|
||||
"hash": "sha256-QKUmbCyB9Xlr+wfEGiCR+xn8xz81FJ77pY90AzMc/Bw=",
|
||||
"owner": "DataDog",
|
||||
"provider-source-address": "registry.terraform.io/DataDog/datadog",
|
||||
"repo": "terraform-provider-datadog",
|
||||
"rev": "v3.17.0",
|
||||
"vendorHash": "sha256-xOXLwSKj48nY0ikh2+c8Ti1eNwnsizgAfWyhGE5ZAXE=",
|
||||
"version": "3.17.0"
|
||||
"rev": "v3.18.0",
|
||||
"vendorHash": "sha256-t3A7ACNbIZ/i5fDhIMDWnKlswT1IHwULejzkfqT5mxQ=",
|
||||
"version": "3.18.0"
|
||||
},
|
||||
"dhall": {
|
||||
"hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=",
|
||||
@ -832,13 +832,13 @@
|
||||
"version": "1.7.1"
|
||||
},
|
||||
"oci": {
|
||||
"hash": "sha256-7822cLdHruCOYu0UGX5KV0f4+W2lQSb2b5SaLDM8cts=",
|
||||
"hash": "sha256-ONMY14nbU2j4MrxoJ7AwOlfrqB0Nv5FQyl4ChAe9+z0=",
|
||||
"owner": "oracle",
|
||||
"provider-source-address": "registry.terraform.io/oracle/oci",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.98.0",
|
||||
"rev": "v4.99.0",
|
||||
"vendorHash": null,
|
||||
"version": "4.98.0"
|
||||
"version": "4.99.0"
|
||||
},
|
||||
"okta": {
|
||||
"hash": "sha256-COGXHUjXYGB2QDY0iBG+MvNcxGy87vpGIerQU2XXEmw=",
|
||||
@ -1275,13 +1275,13 @@
|
||||
"version": "2.11.4"
|
||||
},
|
||||
"wavefront": {
|
||||
"hash": "sha256-6uEEvTX0a+pZ9V+upBZOWH+IemEimVk9Jtfiz2UF5fI=",
|
||||
"hash": "sha256-goiYeZ2iV9KjacBr/MMkA+t2WNTJGHHmwebr/ci+Ezg=",
|
||||
"owner": "vmware",
|
||||
"provider-source-address": "registry.terraform.io/vmware/wavefront",
|
||||
"repo": "terraform-provider-wavefront",
|
||||
"rev": "v3.3.0",
|
||||
"rev": "v3.4.0",
|
||||
"vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=",
|
||||
"version": "3.3.0"
|
||||
"version": "3.4.0"
|
||||
},
|
||||
"yandex": {
|
||||
"hash": "sha256-WdiJD1gt56VDFe2qVKwiYOvneixaGRie6mrxdOCklQY=",
|
||||
|
||||
37
pkgs/applications/networking/feedreaders/goeland/default.nix
Normal file
37
pkgs/applications/networking/feedreaders/goeland/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goeland";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slurdge";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9SxlxRco+eLyyIrMjNCdqAyttDnoc8nuMh+ecCpk3bg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-a29TtT6xSapIiHvC9KHQm4gd1QCK3l0RpKe1ieaKUKA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/slurdge/goeland/version.GitCommit=${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An alternative to RSS2Email written in golang with many filters.";
|
||||
longDescription = ''
|
||||
Goeland excels at creating beautiful emails from RSS,
|
||||
tailored for daily or weekly digest. It include a number of
|
||||
filters that can transform the RSS content along the way.
|
||||
It can also consume other sources, such as a Imgur tag.
|
||||
'';
|
||||
homepage = "https://github.com/slurdge/goeland";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = [ maintainers.sweenu ];
|
||||
};
|
||||
}
|
||||
@ -3,10 +3,10 @@
|
||||
mkFranzDerivation rec {
|
||||
pname = "ferdium";
|
||||
name = "Ferdium";
|
||||
version = "6.1.0";
|
||||
version = "6.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb";
|
||||
sha256 = "sha256-19HDEbp+zqd1VjRoT3yaGEDAwElKlhCm31bemdK90VU=";
|
||||
sha256 = "sha256-lb3dvEaKgOnT5+YAJcYmro71soqkT/jpTjE0YMVMRUA=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [ xorg.libxshmfence ];
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{
|
||||
"version": "1.11.8-sc.1",
|
||||
"rev": "v1.11.8-sc.1",
|
||||
"srcHash": "1a4flbdc18whphxldk0nxqhw0zddsj7zw5js4fpyrr6h85h8qxcp",
|
||||
"webYarnHash": "1q05r2shv1c3kghwksjzrh9rl25ins6r2y46ng7smdml4f9vdcc0",
|
||||
"jsSdkYarnHash": "0z6qqif7kccbvbzr9fw92vs4affm4vw8rgs08rqig8pqpk52lwi2",
|
||||
"reactSdkYarnHash": "0mx9iaciy965jr6vd0gnmyc3jiila9mmh36rv5vm60rx9aw02dv6",
|
||||
"desktopYarnHash": "105xj2xwc9g8cfiby0x93gy8w8w5c76mzzxck5mgvawcc6qpvmrc"
|
||||
"version": "1.11.13-sc.1",
|
||||
"rev": "v1.11.13-sc.1",
|
||||
"srcHash": "1yvd0mzw4qz03nf6im2msi1lp1v4ca9zknvb3ls6va11nxr01h3g",
|
||||
"webYarnHash": "0bmjg9qhd89bdnh398lp257mxdgdd88wj5g3fmc3cavyd6hmgzbn",
|
||||
"jsSdkYarnHash": "0j0jhbfhq0zabnc4glk2kypn53mi5s09l39i41p0zv7g1riwz7al",
|
||||
"reactSdkYarnHash": "195ck2k5fhzi1b8grh5c88aiq4i3baqanjx48dam76li2msfxxfn",
|
||||
"desktopYarnHash": "1scp9y2lmah3n20f1kpc9paspd3qgslg129diis7g11cz4h0wyi5"
|
||||
}
|
||||
|
||||
7
pkgs/applications/video/obs-studio/27.nix
Normal file
7
pkgs/applications/video/obs-studio/27.nix
Normal file
@ -0,0 +1,7 @@
|
||||
{ callPackage, qtx11extras, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
version = "27.2.4";
|
||||
sha256 = "sha256-OiSejQovSmhItrnrQlcVp9PCDRgAhuxTinSpXbH8bo0=";
|
||||
extraBuildInputs = [ qtx11extras ];
|
||||
})
|
||||
22
pkgs/applications/video/obs-studio/28.nix
Normal file
22
pkgs/applications/video/obs-studio/28.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ callPackage
|
||||
, libajantv2
|
||||
, librist
|
||||
, srt
|
||||
, qtwayland
|
||||
, ...
|
||||
} @ args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
version = "28.0.3";
|
||||
sha256 = "sha256-+4H1BjEgxqkAEvRyr2Tg3wXutnMvlYQEdT5jz644fMA=";
|
||||
extraPatches = [ ./Provide-runtime-plugin-destination-as-relative-path.patch ];
|
||||
extraBuildInputs = [
|
||||
libajantv2
|
||||
librist
|
||||
srt
|
||||
qtwayland
|
||||
];
|
||||
extraCMakeFlags = [
|
||||
"-DENABLE_JACK=ON"
|
||||
];
|
||||
})
|
||||
@ -0,0 +1,26 @@
|
||||
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
|
||||
index 790583cd5..763cf3548 100644
|
||||
--- a/libobs/CMakeLists.txt
|
||||
+++ b/libobs/CMakeLists.txt
|
||||
@@ -455,6 +455,8 @@ elseif(OS_POSIX)
|
||||
libobs PROPERTIES BUILD_RPATH "$<TARGET_FILE_DIR:OBS::libobs-opengl>")
|
||||
endif()
|
||||
|
||||
+string(REGEX REPLACE "^${OBS_INSTALL_PREFIX}" "" OBS_PLUGIN_DESTINATION_RELATIVE ${OBS_PLUGIN_DESTINATION})
|
||||
+
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/obsconfig.h.in
|
||||
${CMAKE_BINARY_DIR}/config/obsconfig.h)
|
||||
|
||||
diff --git a/libobs/obsconfig.h.in b/libobs/obsconfig.h.in
|
||||
index 4a664285a..5cff2ca53 100644
|
||||
--- a/libobs/obsconfig.h.in
|
||||
+++ b/libobs/obsconfig.h.in
|
||||
@@ -13,7 +13,7 @@
|
||||
#define OBS_VERSION_CANONICAL "@OBS_VERSION_CANONICAL@"
|
||||
#define OBS_DATA_PATH "@OBS_DATA_PATH@"
|
||||
#define OBS_INSTALL_PREFIX "@OBS_INSTALL_PREFIX@"
|
||||
-#define OBS_PLUGIN_DESTINATION "@OBS_PLUGIN_DESTINATION@"
|
||||
+#define OBS_PLUGIN_DESTINATION "@OBS_PLUGIN_DESTINATION_RELATIVE@"
|
||||
#define OBS_QT_VERSION @_QT_VERSION@
|
||||
|
||||
#cmakedefine LINUX_PORTABLE
|
||||
@ -1,7 +1,11 @@
|
||||
{ config
|
||||
{ version
|
||||
, sha256
|
||||
, extraPatches ? [ ]
|
||||
, extraBuildInputs ? [ ]
|
||||
, extraCMakeFlags ? [ ]
|
||||
, config
|
||||
, lib
|
||||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, addOpenGLRunpath
|
||||
, cmake
|
||||
@ -13,7 +17,6 @@
|
||||
, libpthreadstubs
|
||||
, libXdmcp
|
||||
, qtbase
|
||||
, qtx11extras
|
||||
, qtsvg
|
||||
, speex
|
||||
, libv4l
|
||||
@ -38,34 +41,37 @@
|
||||
, pipewireSupport ? stdenv.isLinux
|
||||
, pipewire
|
||||
, libdrm
|
||||
, wrapQtAppsHook
|
||||
, ...
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) optional optionals;
|
||||
|
||||
in
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-studio";
|
||||
version = "27.2.4";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "obsproject";
|
||||
repo = "obs-studio";
|
||||
rev = version;
|
||||
sha256 = "sha256-OiSejQovSmhItrnrQlcVp9PCDRgAhuxTinSpXbH8bo0=";
|
||||
inherit sha256;
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Lets obs-browser build against CEF 90.1.0+
|
||||
./Enable-file-access-and-universal-access-for-file-URL.patch
|
||||
];
|
||||
] ++ extraPatches;
|
||||
|
||||
nativeBuildInputs = [
|
||||
addOpenGLRunpath
|
||||
cmake
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
wrapQtAppsHook
|
||||
]
|
||||
++ optional scriptingSupport swig;
|
||||
|
||||
@ -81,7 +87,6 @@ mkDerivation rec {
|
||||
libpthreadstubs
|
||||
libXdmcp
|
||||
qtbase
|
||||
qtx11extras
|
||||
qtsvg
|
||||
speex
|
||||
wayland
|
||||
@ -90,6 +95,7 @@ mkDerivation rec {
|
||||
mbedtls
|
||||
pciutils
|
||||
]
|
||||
++ extraBuildInputs
|
||||
++ optionals scriptingSupport [ luajit python3 ]
|
||||
++ optional alsaSupport alsa-lib
|
||||
++ optional pulseaudioSupport libpulseaudio
|
||||
@ -117,7 +123,7 @@ mkDerivation rec {
|
||||
# Add support for browser source
|
||||
"-DBUILD_BROWSER=ON"
|
||||
"-DCEF_ROOT_DIR=../../cef"
|
||||
];
|
||||
] ++ extraCMakeFlags;
|
||||
|
||||
dontWrapGApps = true;
|
||||
preFixup = ''
|
||||
@ -28,7 +28,7 @@
|
||||
obs-vkcapture32 = pkgsi686Linux.obs-studio-plugins.obs-vkcapture;
|
||||
};
|
||||
|
||||
obs-websocket = libsForQt5.callPackage ./obs-websocket.nix { };
|
||||
obs-websocket = throw "obs-websocket has been removed: Functionality has been integrated into obs-studio itself.";
|
||||
|
||||
wlrobs = callPackage ./wlrobs.nix { };
|
||||
}
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f6d8fa3..5f0657d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,6 +1,17 @@
|
||||
+if (POLICY CMP0048)
|
||||
+ cmake_policy(SET CMP0048 NEW)
|
||||
+endif (POLICY CMP0048)
|
||||
+
|
||||
project(move-transition VERSION 2.4.3)
|
||||
set(PROJECT_FULL_NAME "Move Transition")
|
||||
|
||||
+include(FindLibobs.cmake)
|
||||
+find_package(LibObs REQUIRED)
|
||||
+
|
||||
+include_directories(
|
||||
+ "${LIBOBS_INCLUDE_DIR}/../plugins/obs-transitions"
|
||||
+ "${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api")
|
||||
+
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h)
|
||||
|
||||
set(move-transition_HEADERS
|
||||
@@ -38,4 +49,10 @@ target_link_libraries(move-transition
|
||||
libobs)
|
||||
|
||||
set_target_properties(move-transition PROPERTIES FOLDER "plugins/exeldro")
|
||||
-install_obs_plugin_with_data(move-transition data)
|
||||
+set_target_properties(move-transition PROPERTIES PREFIX "")
|
||||
+
|
||||
+install(TARGETS move-transition
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/obs-plugins)
|
||||
+
|
||||
+install(DIRECTORY data/locale/
|
||||
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/obs/obs-plugins/move-transition/locale")
|
||||
@ -7,36 +7,27 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-move-transition";
|
||||
version = "2.4.3";
|
||||
version = "2.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exeldro";
|
||||
repo = "obs-move-transition";
|
||||
rev = version;
|
||||
sha256 = "sha256-/6PcNLOnBBqLZHVKMg1tdX9OktcllEEqnL93nXpuXL0=";
|
||||
sha256 = "sha256-+kAdCM5PEFNxKNmJmf2ASTyUKA7xnbMAA7kP/emoaeI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ obs-studio ];
|
||||
|
||||
cmakeFlags = with lib; [
|
||||
"-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs"
|
||||
preConfigure = ''
|
||||
cp ${obs-studio.src}/cmake/external/ObsPluginHelpers.cmake cmake/
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_OUT_OF_TREE=On"
|
||||
"-Wno-dev"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
cp ${obs-studio.src}/cmake/external/FindLibobs.cmake FindLibobs.cmake
|
||||
'';
|
||||
|
||||
patches = [ ./obs-move-transition-use-FindLibobs.cmake.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace move-source-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
|
||||
substituteInPlace move-value-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
|
||||
substituteInPlace move-transition.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
|
||||
substituteInPlace audio-move.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plugin for OBS Studio to move source to a new position during scene transition";
|
||||
homepage = "https://github.com/exeldro/obs-move-transition";
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-nvfbc";
|
||||
version = "0.0.6";
|
||||
version = "0.0.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "fzwoch";
|
||||
repo = "obs-nvfbc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WoqtppgIcjE0n9atsvAZrXvBVi2rWCIIFDXTgblQK9I=";
|
||||
sha256 = "sha256-AJ3K0O1vrixskn+/Tpg7LsgRO8N4sgDo1Y6gg3CwGVo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja ];
|
||||
|
||||
@ -22,6 +22,15 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake ninja pkg-config ];
|
||||
buildInputs = [ obs-studio pipewire ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs"
|
||||
"-Wno-dev"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
cp ${obs-studio.src}/cmake/external/ObsPluginHelpers.cmake cmake/FindLibObs.cmake
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = " Audio device and application capture for OBS Studio using PipeWire ";
|
||||
homepage = "https://github.com/dimtpap/obs-pipewire-audio-capture";
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, obs-studio
|
||||
, asio_1_10
|
||||
, websocketpp
|
||||
, nlohmann_json
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-websocket";
|
||||
|
||||
# We have updated to the alpha version when OBS Studio 27.2 was
|
||||
# released, because this is the only version of obs-websocket that
|
||||
# builds against the new OBS Studio.
|
||||
version = "5.0.0-alpha3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Palakis";
|
||||
repo = "obs-websocket";
|
||||
rev = version;
|
||||
sha256 = "Lr6SBj5rRTAWmn9Tnlu4Sl7SAkOCRCTP6sFWSp4xB+I=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch can be dropped when obs-websocket is updated to the
|
||||
# next version.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/obsproject/obs-websocket/commit/13c7b83c34eb67b2ee80af05071d81f10d0d2997.patch";
|
||||
sha256 = "TNap/T8+058vhfWzRRr4vmlblFk9tHMUNyG6Ob5PwiM=";
|
||||
name = "obs-addref-werror-fix.patch";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
obs-studio
|
||||
asio_1_10
|
||||
websocketpp
|
||||
nlohmann_json
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Remote-control OBS Studio through WebSockets";
|
||||
homepage = "https://github.com/Palakis/obs-websocket";
|
||||
maintainers = with maintainers; [ erdnaxe ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
};
|
||||
}
|
||||
@ -1,16 +1,18 @@
|
||||
{ lib, stdenv, fetchhg
|
||||
{ lib, stdenv, fetchFromSourcehut
|
||||
, meson, pkg-config, ninja
|
||||
, wayland, obs-studio, libX11
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "wlrobs";
|
||||
version = "unstable-2021-05-13";
|
||||
version = "unstable-2022-10-06";
|
||||
|
||||
src = fetchhg {
|
||||
url = "https://hg.sr.ht/~scoopta/wlrobs";
|
||||
rev = "4184a4a8ea7dc054c993efa16007f3a75b2c6f51";
|
||||
sha256 = "146xirzd3nw1sd216y406v1riky9k08b6a0j4kwxrif5zyqa3adc";
|
||||
src = fetchFromSourcehut {
|
||||
vc = "hg";
|
||||
owner = "~scoopta";
|
||||
repo = "wlrobs";
|
||||
rev = "78be323b25e1365f5c8f9dcba6938063ca10f71f";
|
||||
sha256 = "sha256-/VemJkk695BdSDsODmYIPdhPwggzIhBi/0m6P+AYfx0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja ];
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, coreutils
|
||||
, nix
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-common";
|
||||
version = "0.8.4";
|
||||
version = "0.8.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8RKx3OPb53hCquFcT+AbtX+LDNEvzLHuqtkbvXewqRs=";
|
||||
sha256 = "sha256-kAwcVB39rcS59I2qJhYc7Xr3mXMWtKfN45jo+8BNHwA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -43,6 +43,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests = {
|
||||
inherit nix;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "AWS SDK for C common core";
|
||||
homepage = "https://github.com/awslabs/aws-c-common";
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.0.108";
|
||||
version = "0.0.109";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charliermarsh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-I2F4x4gsmL22j+atfxRQLKmKLdIwbXEEN8EcXV4ZAJA=";
|
||||
sha256 = "sha256-11vaL8ztWLqhImQ4uzHPAwciHtegz320hDJq6kH8ujI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-EJm1bfJ9/Jqe0tCQftAz3qR8TBGxcZiqJnJ2QnhyE58=";
|
||||
cargoSha256 = "sha256-ixjH6gbgrcMtGeLFFyAPTmgF43UAzkhpxNp2S59iwIY=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,9 +1,9 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, openssl
|
||||
, pkg-config
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, pkg-config
|
||||
, stdenv
|
||||
, openssl
|
||||
, Security
|
||||
}:
|
||||
|
||||
@ -11,24 +11,19 @@ rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-wasi";
|
||||
version = "0.1.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-jugq7A3L+5+YUSyp9WWKBd4BA2pcXKd4CMVg5OVMcEA=";
|
||||
src = fetchCrate {
|
||||
inherit version;
|
||||
pname = "cargo-wasi-src";
|
||||
sha256 = "sha256-/u5GKqGwJWS6Gzc1WZ7O5ZSHHGoqBVZ4jQDEIfAyciE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-L4vRLYm1WaCmA4bGyY7D0yxXuqxGSHMMD/wlY8+MgPk=";
|
||||
cargoSha256 = "sha256-eF3HrulY7HrKseCYyZyC2EuWboFvmia2qLymBxvopKI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
cargoPatches = [
|
||||
./0001-Add-Cargo.lock.patch
|
||||
];
|
||||
|
||||
# Checks need to be disabled here because the current test suite makes assumptions
|
||||
# about the surrounding environment that aren't Nix friendly. See these lines for specifics:
|
||||
# https://github.com/bytecodealliance/cargo-wasi/blob/0.1.26/tests/tests/support.rs#L13-L18
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wails";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wailsapp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Vrd6RP/N5Lrh5Ocr2W03m41fJXVXLJZle4C6xeF/jxM=";
|
||||
sha256 = "sha256-g5tZUVOZ2ywD2vS9B3y3GHaoABr2rSIZGUOsdUJOL8Q=";
|
||||
} + "/v2";
|
||||
|
||||
vendorSha256 = "sha256-jRW8SROt0CON17xZ+I3WiQow7yC1ly7pPHgbpEr1kW8=";
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
, json_c
|
||||
, linux-pam
|
||||
, libevent
|
||||
, libxcrypt
|
||||
, nspr
|
||||
, nss
|
||||
, openldap
|
||||
@ -68,6 +69,7 @@ stdenv.mkDerivation rec {
|
||||
json_c
|
||||
linux-pam
|
||||
libevent
|
||||
libxcrypt
|
||||
nspr
|
||||
nss
|
||||
cyrus_sasl
|
||||
|
||||
@ -31,10 +31,10 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.38.0";
|
||||
version = "2.40.0";
|
||||
webUiStatic = fetchurl {
|
||||
url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";
|
||||
sha256 = "sha256-0CcWHJYso9iI1isCa2ZKYtNpfqcUt5sj23xkufxv6rw=";
|
||||
sha256 = "sha256-1uNwGs/UmwMhST7LyDq4hUEW9Y6xpmvCDDT3f58r3d4=";
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
@ -45,10 +45,10 @@ buildGoModule rec {
|
||||
rev = "v${version}";
|
||||
owner = "prometheus";
|
||||
repo = "prometheus";
|
||||
sha256 = "sha256-5s2Q3xjublHAQSB6MaxZTMOPS0T6/Bn5Ki8NCkBYM2E=";
|
||||
sha256 = "sha256-QKeZ4N5I4VjTIT5WmEGt+gXt1Nnx3tzecLaSlhvGGuE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-wfHdfW4D4ESbglUUjAl5a93aJqLuQkqKHMChHGnCmCg=";
|
||||
vendorSha256 = "sha256-aRVoEgP84ITQ1D0PsFVJUKH/Uin7s80iQCwzgrfpjoM=";
|
||||
|
||||
excludedPackages = [ "documentation/prometheus-mixin" ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fastly-exporter";
|
||||
version = "7.2.4";
|
||||
version = "7.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "peterbourgon";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dg2JPVZJSjbBirvKvfQHGi06Fah48RHk5vbHgn5Q59M=";
|
||||
sha256 = "sha256-W/P4jUBNDR3t7FESNyUUnNWfGR0PI/dG03EVKYt8S2Y=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-wsOgZTeErUQkt+yJ7P0Oi8Ks7WBj/e457lZNs+ZwJgY=";
|
||||
vendorSha256 = "sha256-exoDUxcOXVn7wUqfLLtJpklPYFHjLodEYa3lF+qFD+A=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Prometheus exporter for the Fastly Real-time Analytics API";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "unifi-poller";
|
||||
version = "2.1.3";
|
||||
version = "2.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unifi-poller";
|
||||
repo = "unifi-poller";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xh9s1xAhIeEmeDprl7iPdE6pxmxZjzgMvilobiIoJp0=";
|
||||
sha256 = "sha256-79aBqYS8B+gIqmhu/UIA7g+FvTS/68qsK7qi5MGH10k=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-HoYgBKTl9HIMVzzzNYtRrfmqb7HCpPHVPeR4gUXneWk=";
|
||||
vendorSha256 = "sha256-WVYQ3cZOO+EyJRTFcMjziDHwqqinm1IvxvSLuHTaqT8=";
|
||||
|
||||
ldflags = [
|
||||
"-w" "-s"
|
||||
|
||||
@ -49,7 +49,6 @@ gcc10Stdenv.mkDerivation rec {
|
||||
# prevent failing with "cmake-3.13.4/nix-support/setup-hook: line 10: ./3rdParty/rocksdb/RocksDBConfig.cmake.in: No such file or directory"
|
||||
dontFixCmake = true;
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
preConfigure = "patchShebangs utils";
|
||||
|
||||
postPatch = ''
|
||||
sed -ie 's!/bin/echo!echo!' 3rdParty/V8/gypfiles/*.gypi
|
||||
@ -59,6 +58,10 @@ gcc10Stdenv.mkDerivation rec {
|
||||
substituteInPlace js/server/server.js --replace "require('@arangodb').checkAvailableVersions();" ""
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs utils
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_MAINTAINER_MODE=OFF"
|
||||
"-DUSE_GOOGLE_TESTS=OFF"
|
||||
@ -76,6 +79,6 @@ gcc10Stdenv.mkDerivation rec {
|
||||
description = "A native multi-model database with flexible data models for documents, graphs, and key-values";
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = [ maintainers.flosse maintainers.jsoo1 ];
|
||||
maintainers = with maintainers; [ flosse jsoo1 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
{ lib, newScope, pixman }:
|
||||
{ lib, pixman }:
|
||||
|
||||
lib.makeScope newScope (self: with self; {
|
||||
self: with self; {
|
||||
|
||||
inherit pixman;
|
||||
|
||||
@ -70,7 +70,7 @@ lib.makeScope newScope (self: with self; {
|
||||
}) {};
|
||||
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
encodings = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation {
|
||||
encodings = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation {
|
||||
pname = "encodings";
|
||||
version = "1.0.5";
|
||||
builder = ./builder.sh;
|
||||
@ -80,7 +80,7 @@ lib.makeScope newScope (self: with self; {
|
||||
};
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config mkfontscale ];
|
||||
buildInputs = [ ];
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
@ -99,6 +99,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -116,6 +117,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -133,6 +135,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -150,6 +153,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -167,6 +171,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -200,6 +205,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -217,6 +223,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -234,6 +241,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -251,6 +259,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -268,6 +277,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -285,6 +295,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -302,6 +313,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -319,6 +331,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -336,6 +349,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -353,6 +367,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -370,6 +385,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -387,6 +403,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -404,6 +421,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -421,6 +439,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -438,6 +457,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -455,6 +475,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -472,6 +493,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -489,6 +511,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -506,6 +529,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -523,6 +547,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -540,6 +565,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -557,6 +583,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -574,6 +601,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -591,6 +619,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -608,6 +637,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -625,6 +655,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -642,6 +673,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -691,6 +723,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -708,6 +741,7 @@ lib.makeScope newScope (self: with self; {
|
||||
nativeBuildInputs = [ pkg-config mkfontscale ];
|
||||
buildInputs = [ fontutil ];
|
||||
configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
|
||||
postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -1976,7 +2010,7 @@ lib.makeScope newScope (self: with self; {
|
||||
}) {};
|
||||
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, libxcrypt, xorgproto, libXrender, libXt }: stdenv.mkDerivation {
|
||||
xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation {
|
||||
pname = "xdm";
|
||||
version = "1.1.12";
|
||||
builder = ./builder.sh;
|
||||
@ -1987,7 +2021,7 @@ lib.makeScope newScope (self: with self; {
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt libxcrypt ];
|
||||
buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ];
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
@ -3559,4 +3593,4 @@ lib.makeScope newScope (self: with self; {
|
||||
meta.platforms = lib.platforms.unix;
|
||||
}) {};
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
@ -154,7 +154,7 @@ while (<>) {
|
||||
push @nativeRequires, "bdftopcf";
|
||||
}
|
||||
|
||||
if ($file =~ /AC_PATH_PROG\(MKFONTSCALE/) {
|
||||
if ($file =~ /AC_PATH_PROG\(MKFONTSCALE/ || $file =~ /XORG_FONT_REQUIRED_PROG\(MKFONTSCALE/) {
|
||||
push @nativeRequires, "mkfontscale";
|
||||
}
|
||||
|
||||
@ -192,6 +192,7 @@ while (<>) {
|
||||
if ($isFont) {
|
||||
push @requires, "fontutil";
|
||||
push @{$extraAttrs{$pkg}}, "configureFlags = [ \"--with-fontrootdir=\$(out)/lib/X11/fonts\" ];";
|
||||
push @{$extraAttrs{$pkg}}, "postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`\$PKG_CONFIG' '';";
|
||||
}
|
||||
|
||||
sub process {
|
||||
@ -250,9 +251,9 @@ open OUT, ">default.nix";
|
||||
print OUT "";
|
||||
print OUT <<EOF;
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
{ lib, newScope, pixman }:
|
||||
{ lib, pixman }:
|
||||
|
||||
lib.makeScope newScope (self: with self; {
|
||||
self: with self; {
|
||||
|
||||
inherit pixman;
|
||||
|
||||
@ -336,6 +337,6 @@ foreach my $pkg (sort (keys %pkgURLs)) {
|
||||
EOF
|
||||
}
|
||||
|
||||
print OUT "})\n";
|
||||
print OUT "}\n";
|
||||
|
||||
close OUT;
|
||||
|
||||
@ -4,8 +4,9 @@
|
||||
freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge,
|
||||
libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
|
||||
mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
|
||||
mcpp, libepoxy, openssl, pkg-config, llvm, libxslt,
|
||||
ApplicationServices, Carbon, Cocoa, Xplugin
|
||||
mcpp, libepoxy, openssl, pkg-config, llvm, libxslt, libxcrypt,
|
||||
ApplicationServices, Carbon, Cocoa, Xplugin,
|
||||
xorg
|
||||
}:
|
||||
|
||||
let
|
||||
@ -23,7 +24,7 @@ in
|
||||
self: super:
|
||||
{
|
||||
bdftopcf = super.bdftopcf.overrideAttrs (attrs: {
|
||||
buildInputs = attrs.buildInputs ++ [ self.xorgproto ];
|
||||
buildInputs = attrs.buildInputs ++ [ xorg.xorgproto ];
|
||||
});
|
||||
|
||||
bitmap = super.bitmap.overrideAttrs (attrs: {
|
||||
@ -32,7 +33,7 @@ self: super:
|
||||
paths=(
|
||||
"$out/share/X11/%T/%N"
|
||||
"$out/include/X11/%T/%N"
|
||||
"${self.xbitmaps}/include/X11/%T/%N"
|
||||
"${xorg.xbitmaps}/include/X11/%T/%N"
|
||||
)
|
||||
wrapProgram "$out/bin/bitmap" \
|
||||
--suffix XFILESEARCHPATH : $(IFS=:; echo "''${paths[*]}")
|
||||
@ -41,10 +42,6 @@ self: super:
|
||||
'';
|
||||
});
|
||||
|
||||
encodings = super.encodings.overrideAttrs (attrs: {
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ self.mkfontscale ];
|
||||
});
|
||||
|
||||
editres = super.editres.overrideAttrs (attrs: {
|
||||
hardeningDisable = [ "format" ];
|
||||
});
|
||||
@ -52,7 +49,7 @@ self: super:
|
||||
fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: {
|
||||
postInstall =
|
||||
''
|
||||
ALIASFILE=${self.fontalias}/share/fonts/X11/misc/fonts.alias
|
||||
ALIASFILE=${xorg.fontalias}/share/fonts/X11/misc/fonts.alias
|
||||
test -f $ALIASFILE
|
||||
cp $ALIASFILE $out/lib/X11/fonts/misc/fonts.alias
|
||||
'';
|
||||
@ -63,7 +60,7 @@ self: super:
|
||||
});
|
||||
|
||||
imake = super.imake.overrideAttrs (attrs: {
|
||||
inherit (self) xorgcffiles;
|
||||
inherit (xorg) xorgcffiles;
|
||||
x11BuildHook = ./imake.sh;
|
||||
patches = [./imake.patch ./imake-cc-wrapper-uberhack.patch];
|
||||
setupHook = ./imake-setup-hook.sh;
|
||||
@ -74,7 +71,7 @@ self: super:
|
||||
inherit tradcpp;
|
||||
});
|
||||
|
||||
mkfontdir = self.mkfontscale;
|
||||
mkfontdir = xorg.mkfontscale;
|
||||
|
||||
libxcb = super.libxcb.overrideAttrs (attrs: {
|
||||
configureFlags = [ "--enable-xkb" "--enable-xinput" ]
|
||||
@ -89,7 +86,7 @@ self: super:
|
||||
depsBuildBuild = [
|
||||
buildPackages.stdenv.cc
|
||||
] ++ lib.optionals stdenv.hostPlatform.isStatic [
|
||||
(self.buildPackages.stdenv.cc.libc.static or null)
|
||||
(xorg.buildPackages.stdenv.cc.libc.static or null)
|
||||
];
|
||||
preConfigure = ''
|
||||
sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure
|
||||
@ -99,7 +96,7 @@ self: super:
|
||||
rm -rf $out/share/doc
|
||||
'';
|
||||
CPP = lib.optionalString stdenv.isDarwin "clang -E -";
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.xorgproto ];
|
||||
});
|
||||
|
||||
libAppleWM = super.libAppleWM.overrideAttrs (attrs: {
|
||||
@ -111,7 +108,7 @@ self: super:
|
||||
|
||||
libXau = super.libXau.overrideAttrs (attrs: {
|
||||
outputs = [ "out" "dev" ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.xorgproto ];
|
||||
});
|
||||
|
||||
libXdmcp = super.libXdmcp.overrideAttrs (attrs: {
|
||||
@ -152,6 +149,10 @@ self: super:
|
||||
'';
|
||||
});
|
||||
|
||||
xdm = super.xdm.overrideAttrs (attrs: {
|
||||
buildInputs = attrs.buildInputs ++ [ libxcrypt ];
|
||||
});
|
||||
|
||||
# Propagate some build inputs because of header file dependencies.
|
||||
# Note: most of these are in Requires.private, so maybe builder.sh
|
||||
# should propagate them automatically.
|
||||
@ -161,7 +162,7 @@ self: super:
|
||||
'';
|
||||
configureFlags = attrs.configureFlags or []
|
||||
++ malloc0ReturnsNullCrossFlag;
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libSM ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libSM ];
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
CPP = if stdenv.isDarwin then "clang -E -" else "${stdenv.cc.targetPrefix}cc -E -";
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
@ -181,12 +182,12 @@ self: super:
|
||||
|
||||
libXcomposite = super.libXcomposite.overrideAttrs (attrs: {
|
||||
outputs = [ "out" "dev" ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXfixes ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libXfixes ];
|
||||
});
|
||||
|
||||
libXaw = super.libXaw.overrideAttrs (attrs: {
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXmu ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libXmu ];
|
||||
});
|
||||
|
||||
libXcursor = super.libXcursor.overrideAttrs (attrs: {
|
||||
@ -199,7 +200,7 @@ self: super:
|
||||
|
||||
libXft = super.libXft.overrideAttrs (attrs: {
|
||||
outputs = [ "out" "dev" ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXrender freetype fontconfig ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libXrender freetype fontconfig ];
|
||||
configureFlags = attrs.configureFlags or []
|
||||
++ malloc0ReturnsNullCrossFlag;
|
||||
|
||||
@ -214,7 +215,7 @@ self: super:
|
||||
|
||||
libXext = super.libXext.overrideAttrs (attrs: {
|
||||
outputs = [ "out" "dev" "man" "doc" ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto self.libXau ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.xorgproto xorg.libXau ];
|
||||
configureFlags = attrs.configureFlags or []
|
||||
++ malloc0ReturnsNullCrossFlag;
|
||||
});
|
||||
@ -225,7 +226,7 @@ self: super:
|
||||
|
||||
libXi = super.libXi.overrideAttrs (attrs: {
|
||||
outputs = [ "out" "dev" "man" "doc" ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXfixes self.libXext ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libXfixes xorg.libXext ];
|
||||
configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"xorg_cv_malloc0_returns_null=no"
|
||||
] ++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared";
|
||||
@ -246,30 +247,30 @@ self: super:
|
||||
outputs = [ "out" "dev" ];
|
||||
configureFlags = attrs.configureFlags or []
|
||||
++ malloc0ReturnsNullCrossFlag;
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXrender ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libXrender ];
|
||||
});
|
||||
|
||||
libSM = super.libSM.overrideAttrs (attrs: {
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libICE ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libICE ];
|
||||
});
|
||||
|
||||
libXrender = super.libXrender.overrideAttrs (attrs: {
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
configureFlags = attrs.configureFlags or []
|
||||
++ malloc0ReturnsNullCrossFlag;
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.xorgproto ];
|
||||
});
|
||||
|
||||
libXres = super.libXres.overrideAttrs (attrs: {
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
buildInputs = with self; attrs.buildInputs ++ [ utilmacros ];
|
||||
buildInputs = with xorg; attrs.buildInputs ++ [ utilmacros ];
|
||||
configureFlags = attrs.configureFlags or []
|
||||
++ malloc0ReturnsNullCrossFlag;
|
||||
});
|
||||
|
||||
libXScrnSaver = super.libXScrnSaver.overrideAttrs (attrs: {
|
||||
buildInputs = with self; attrs.buildInputs ++ [ utilmacros ];
|
||||
buildInputs = with xorg; attrs.buildInputs ++ [ utilmacros ];
|
||||
configureFlags = attrs.configureFlags or []
|
||||
++ malloc0ReturnsNullCrossFlag;
|
||||
});
|
||||
@ -284,7 +285,7 @@ self: super:
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
configureFlags = attrs.configureFlags or []
|
||||
++ malloc0ReturnsNullCrossFlag;
|
||||
buildInputs = attrs.buildInputs ++ [self.xorgproto];
|
||||
buildInputs = attrs.buildInputs ++ [xorg.xorgproto];
|
||||
});
|
||||
|
||||
libXp = super.libXp.overrideAttrs (attrs: {
|
||||
@ -297,7 +298,7 @@ self: super:
|
||||
});
|
||||
|
||||
libXpresent = super.libXpresent.overrideAttrs (attrs: {
|
||||
buildInputs = with self; attrs.buildInputs ++ [ libXext libXfixes libXrandr ];
|
||||
buildInputs = with xorg; attrs.buildInputs ++ [ libXext libXfixes libXrandr ];
|
||||
});
|
||||
|
||||
libxkbfile = super.libxkbfile.overrideAttrs (attrs: {
|
||||
@ -321,8 +322,8 @@ self: super:
|
||||
postInstall =
|
||||
''
|
||||
mkdir -p $out/share/man/man7
|
||||
ln -sfn ${self.xkeyboardconfig}/etc/X11 $out/share/X11
|
||||
ln -sfn ${self.xkeyboardconfig}/share/man/man7/xkeyboard-config.7.gz $out/share/man/man7
|
||||
ln -sfn ${xorg.xkeyboardconfig}/etc/X11 $out/share/X11
|
||||
ln -sfn ${xorg.xkeyboardconfig}/share/man/man7/xkeyboard-config.7.gz $out/share/man/man7
|
||||
'';
|
||||
});
|
||||
|
||||
@ -444,7 +445,7 @@ self: super:
|
||||
|
||||
xf86videoati = super.xf86videoati.overrideAttrs (attrs: {
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ];
|
||||
buildInputs = attrs.buildInputs ++ [ self.utilmacros ];
|
||||
buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/commit/e0511968d04b42abf11bc0ffb387f143582bc144.patch";
|
||||
@ -455,12 +456,12 @@ self: super:
|
||||
|
||||
xf86videonouveau = super.xf86videonouveau.overrideAttrs (attrs: {
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ];
|
||||
buildInputs = attrs.buildInputs ++ [ self.utilmacros ];
|
||||
buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ];
|
||||
});
|
||||
|
||||
xf86videoglint = super.xf86videoglint.overrideAttrs (attrs: {
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ];
|
||||
buildInputs = attrs.buildInputs ++ [ self.utilmacros ];
|
||||
buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ];
|
||||
# https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint/-/issues/1
|
||||
meta = attrs.meta // { broken = true; };
|
||||
});
|
||||
@ -599,11 +600,11 @@ self: super:
|
||||
});
|
||||
|
||||
xvinfo = super.xvinfo.overrideAttrs (attrs: {
|
||||
buildInputs = attrs.buildInputs ++ [self.libXext];
|
||||
buildInputs = attrs.buildInputs ++ [xorg.libXext];
|
||||
});
|
||||
|
||||
xkbcomp = super.xkbcomp.overrideAttrs (attrs: {
|
||||
configureFlags = [ "--with-xkb-config-root=${self.xkeyboardconfig}/share/X11/xkb" ];
|
||||
configureFlags = [ "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb" ];
|
||||
});
|
||||
|
||||
xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: {
|
||||
@ -693,7 +694,7 @@ self: super:
|
||||
EOF
|
||||
'';
|
||||
in
|
||||
self.xkeyboardconfig.overrideAttrs (old: {
|
||||
xorg.xkeyboardconfig.overrideAttrs (old: {
|
||||
buildInputs = old.buildInputs ++ [ automake ];
|
||||
postPatch = with lib; concatStrings (mapAttrsToList patchIn layouts);
|
||||
});
|
||||
@ -714,7 +715,7 @@ self: super:
|
||||
mesonFlags = [ "-Dlegacy=true" ];
|
||||
});
|
||||
|
||||
xorgserver = with self; super.xorgserver.overrideAttrs (attrs_passed:
|
||||
xorgserver = with xorg; super.xorgserver.overrideAttrs (attrs_passed:
|
||||
# exchange attrs if abiCompat is set
|
||||
let
|
||||
version = lib.getVersion attrs_passed;
|
||||
@ -821,8 +822,8 @@ self: super:
|
||||
"--enable-xcsecurity" # enable SECURITY extension
|
||||
"--with-default-font-path=" # there were only paths containing "${prefix}",
|
||||
# and there are no fonts in this package anyway
|
||||
"--with-xkb-bin-directory=${self.xkbcomp}/bin"
|
||||
"--with-xkb-path=${self.xkeyboardconfig}/share/X11/xkb"
|
||||
"--with-xkb-bin-directory=${xorg.xkbcomp}/bin"
|
||||
"--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb"
|
||||
"--with-xkb-output=$out/share/X11/xkb/compiled"
|
||||
"--with-log-dir=/var/log"
|
||||
"--enable-glamor"
|
||||
@ -842,7 +843,7 @@ self: super:
|
||||
'';
|
||||
passthru.version = version; # needed by virtualbox guest additions
|
||||
} else {
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook self.utilmacros self.fontutil ];
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook xorg.utilmacros xorg.fontutil ];
|
||||
buildInputs = commonBuildInputs ++ [
|
||||
bootstrap_cmds automake autoconf
|
||||
Xplugin Carbon Cocoa
|
||||
@ -930,8 +931,8 @@ self: super:
|
||||
});
|
||||
|
||||
xcursorthemes = super.xcursorthemes.overrideAttrs (attrs: {
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ self.xcursorgen ];
|
||||
buildInputs = attrs.buildInputs ++ [ self.xorgproto ];
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ xorg.xcursorgen ];
|
||||
buildInputs = attrs.buildInputs ++ [ xorg.xorgproto ];
|
||||
configureFlags = [ "--with-cursordir=$(out)/share/icons" ];
|
||||
});
|
||||
|
||||
@ -941,7 +942,7 @@ self: super:
|
||||
buildInputs = attrs.buildInputs ++ lib.optional isDarwin bootstrap_cmds;
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
configureFlags = [
|
||||
"--with-xserver=${self.xorgserver.out}/bin/X"
|
||||
"--with-xserver=${xorg.xorgserver.out}/bin/X"
|
||||
] ++ lib.optionals isDarwin [
|
||||
"--with-bundle-id-prefix=org.nixos.xquartz"
|
||||
"--with-launchdaemons-dir=\${out}/LaunchDaemons"
|
||||
@ -959,8 +960,8 @@ self: super:
|
||||
# Avoid replacement of word-looking cpp's builtin macros in Nix's cross-compiled paths
|
||||
substituteInPlace Makefile.in --replace "PROGCPPDEFS =" "PROGCPPDEFS = -Dlinux=linux -Dunix=unix"
|
||||
'';
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xauth ]
|
||||
++ lib.optionals isDarwin [ self.libX11 self.xorgproto ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.xauth ]
|
||||
++ lib.optionals isDarwin [ xorg.libX11 xorg.xorgproto ];
|
||||
postFixup = ''
|
||||
substituteInPlace $out/bin/startx --replace $out/etc/X11/xinit/xserverrc /etc/X11/xinit/xserverrc
|
||||
'';
|
||||
@ -977,7 +978,7 @@ self: super:
|
||||
rev = "31486f40f8e8f8923ca0799aea84b58799754564";
|
||||
sha256 = "sha256-nqT9VZDb2kAC72ot9UCdwEkM1uuP9NriJePulzrdZlM=";
|
||||
};
|
||||
buildInputs = attrs.buildInputs ++ [ self.libXScrnSaver self.libXfixes self.libXv self.pixman self.utilmacros ];
|
||||
buildInputs = attrs.buildInputs ++ [ xorg.libXScrnSaver xorg.libXfixes xorg.libXv xorg.pixman xorg.utilmacros ];
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook ];
|
||||
configureFlags = [ "--with-default-dri=3" "--enable-tools" ];
|
||||
|
||||
@ -987,7 +988,7 @@ self: super:
|
||||
});
|
||||
|
||||
xf86videoopenchrome = super.xf86videoopenchrome.overrideAttrs (attrs: {
|
||||
buildInputs = attrs.buildInputs ++ [ self.libXv ];
|
||||
buildInputs = attrs.buildInputs ++ [ xorg.libXv ];
|
||||
patches = [
|
||||
# Pull upstream fix for -fno-common toolchains.
|
||||
(fetchpatch {
|
||||
|
||||
@ -217,4 +217,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
|
||||
mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2
|
||||
mirror://xorg/individual/util/xorg-cf-files-1.0.7.tar.bz2
|
||||
mirror://xorg/individual/xserver/xorg-server-1.20.13.tar.xz
|
||||
mirror://xorg/individual/xserver/xorg-server-1.20.14.tar.xz
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oksh";
|
||||
version = "7.1";
|
||||
version = "7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ibara";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-cRUL4JwwZ1Nfs9exzleEvJYCZz6knKbjnC9xeRMvClA=";
|
||||
sha256 = "sha256-3EIWFlL2TJiRfAZ7kWtt2iEB2yAnTWbuf5LlFJjXdgk=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "credhub-cli";
|
||||
version = "2.9.6";
|
||||
version = "2.9.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry-incubator";
|
||||
repo = "credhub-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-g7LJlMKwV3Cq0LEBPWPgzPJAp9W6bwVuuVVv/ZhuBSM=";
|
||||
sha256 = "sha256-lhnH4+/fwZKEDN1465T8+elinTkhjYbOX2aj5eRnwZk=";
|
||||
};
|
||||
|
||||
# these tests require network access that we're not going to give them
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bzip3";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "kspalaiologos";
|
||||
repo = "bzip3";
|
||||
rev = version;
|
||||
hash = "sha256-Ul4nybQ+Gj3i41AFxk2WzVD+b2dJVyCUBuX4ZGjXwUs=";
|
||||
hash = "sha256-RzlDubT+nczIlUcwnZ5PsO5s3Op7WLRuiMBRBasuEFI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fluent-bit";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fluent";
|
||||
repo = "fluent-bit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8P28xaFyaU0GrIrO+D+Rp9H4xgOymHtbAbd2mI79vSI=";
|
||||
sha256 = "sha256-Fn6+hAVGgbsqR6wQc2tGcslyxlX5XIqc1PYLyhjTfh0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison ];
|
||||
@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://fluentbit.io";
|
||||
maintainers = with maintainers; [ samrose fpletz ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
{ callPackage }:
|
||||
{ lib, pkgs }:
|
||||
|
||||
lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
{
|
||||
# All the defaults
|
||||
connman = callPackage ./connman.nix { };
|
||||
connman = callPackage ./connman { };
|
||||
|
||||
connmanFull = callPackage ./connman.nix {
|
||||
connmanFull = connman.override {
|
||||
# TODO: Why is this in `connmanFull` and not the default build? See TODO in
|
||||
# nixos/modules/services/networking/connman.nix (near the assertions)
|
||||
enableNetworkManager = true;
|
||||
@ -14,7 +15,7 @@
|
||||
enableTist = true;
|
||||
};
|
||||
|
||||
connmanMinimal = callPackage ./connman.nix {
|
||||
connmanMinimal = connman.override {
|
||||
enableOpenconnect = false;
|
||||
enableOpenvpn = false;
|
||||
enableVpnc = false;
|
||||
@ -37,4 +38,12 @@
|
||||
enableClient = false;
|
||||
# enableDatafiles = false; # If disabled, configuration and data files are not installed
|
||||
};
|
||||
}
|
||||
|
||||
connman_dmenu = callPackage ./connman_dmenu { };
|
||||
|
||||
connman-gtk = callPackage ./connman-gtk { };
|
||||
|
||||
connman-ncurses = callPackage ./connman-ncurses { };
|
||||
|
||||
connman-notify = callPackage ./connman-notify { };
|
||||
})
|
||||
|
||||
@ -43,7 +43,9 @@ in stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
# Some tests are expected to fail on ARM64
|
||||
# See: https://gitlab.com/spectre.app/cli/-/issues/27#note_962950844 (mpw is a predecessor to spectre-cli and this issue is relevant to mpw as well)
|
||||
doCheck = !(stdenv.isLinux && stdenv.isAarch64);
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
@ -5370,20 +5370,18 @@ with pkgs;
|
||||
|
||||
conspy = callPackage ../os-specific/linux/conspy {};
|
||||
|
||||
inherit (callPackage ../tools/networking/connman {})
|
||||
connmanPackages =
|
||||
recurseIntoAttrs (callPackage ../tools/networking/connman { });
|
||||
inherit (connmanPackages)
|
||||
connman
|
||||
connmanFull
|
||||
connmanMinimal
|
||||
connman_dmenu
|
||||
connman-gtk
|
||||
connman-ncurses
|
||||
connman-notify
|
||||
;
|
||||
|
||||
connman-gtk = callPackage ../tools/networking/connman/connman-gtk { };
|
||||
|
||||
connman-ncurses = callPackage ../tools/networking/connman/connman-ncurses { };
|
||||
|
||||
connman-notify = callPackage ../tools/networking/connman/connman-notify { };
|
||||
|
||||
connman_dmenu = callPackage ../tools/networking/connman/connman_dmenu { };
|
||||
|
||||
convertlit = callPackage ../tools/text/convertlit { };
|
||||
|
||||
collectd = callPackage ../tools/system/collectd {
|
||||
@ -7367,6 +7365,8 @@ with pkgs;
|
||||
|
||||
godot-server = callPackage ../development/tools/godot/3/server.nix { };
|
||||
|
||||
goeland = callPackage ../applications/networking/feedreaders/goeland { };
|
||||
|
||||
go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
|
||||
|
||||
goofys = callPackage ../tools/filesystems/goofys { };
|
||||
@ -24628,19 +24628,41 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.libs) Xplugin;
|
||||
};
|
||||
|
||||
# Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage`
|
||||
# so as not to have the newly bound xorg items already in scope, which would
|
||||
# have created a cycle.
|
||||
xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg {
|
||||
}).overrideScope' (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa;
|
||||
inherit (darwin.apple_sdk.libs) Xplugin;
|
||||
inherit (buildPackages.darwin) bootstrap_cmds;
|
||||
udev = if stdenv.isLinux then udev else null;
|
||||
libdrm = if stdenv.isLinux then libdrm else null;
|
||||
abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override`
|
||||
or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin
|
||||
}));
|
||||
xorg = let
|
||||
otherSplices = {
|
||||
selfBuildBuild = pkgsBuildBuild.xorg;
|
||||
selfBuildHost = pkgsBuildHost.xorg;
|
||||
selfBuildTarget = pkgsBuildTarget.xorg;
|
||||
selfHostHost = pkgsHostHost.xorg;
|
||||
selfTargetTarget = pkgsTargetTarget.xorg or { };
|
||||
};
|
||||
keep = _self: { };
|
||||
extra = _spliced0: { };
|
||||
|
||||
# Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage`
|
||||
# so as not to have the newly bound xorg items already in scope, which would
|
||||
# have created a cycle.
|
||||
overrides = lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa;
|
||||
inherit (darwin.apple_sdk.libs) Xplugin;
|
||||
inherit (buildPackages.darwin) bootstrap_cmds;
|
||||
udev = if stdenv.isLinux then udev else null;
|
||||
libdrm = if stdenv.isLinux then libdrm else null;
|
||||
abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override`
|
||||
or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin
|
||||
};
|
||||
|
||||
generatedPackages = lib.callPackageWith __splicedPackages ../servers/x11/xorg/default.nix {};
|
||||
|
||||
xorgPackages = lib.makeScopeWithSplicing
|
||||
splicePackages
|
||||
newScope
|
||||
otherSplices
|
||||
keep
|
||||
extra
|
||||
(lib.extends overrides generatedPackages);
|
||||
|
||||
in recurseIntoAttrs xorgPackages;
|
||||
|
||||
xorg-autoconf = callPackage ../development/tools/misc/xorg-autoconf { };
|
||||
|
||||
@ -30962,9 +30984,16 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation;
|
||||
};
|
||||
|
||||
obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {
|
||||
obs-studio27 = libsForQt5.callPackage ../applications/video/obs-studio/27.nix {
|
||||
ffmpeg_4 = ffmpeg-full;
|
||||
};
|
||||
|
||||
obs-studio28 = qt6Packages.callPackage ../applications/video/obs-studio/28.nix {
|
||||
ffmpeg_4 = ffmpeg-full;
|
||||
};
|
||||
|
||||
obs-studio = obs-studio28;
|
||||
|
||||
obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {});
|
||||
wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix {};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user