mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-22 21:30:45 +02:00
Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
sternenseemann
commit
fb67ad2eea
|
|
@ -71,7 +71,7 @@ The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given
|
|||
|
||||
To package Dotnet applications, you can use `buildDotnetModule`. This has similar arguments to `stdenv.mkDerivation`, with the following additions:
|
||||
|
||||
* `projectFile` has to be used for specifying the dotnet project file relative to the source root. These usually have `.sln` or `.csproj` file extensions.
|
||||
* `projectFile` has to be used for specifying the dotnet project file relative to the source root. These usually have `.sln` or `.csproj` file extensions. This can be an array of multiple projects as well.
|
||||
* `nugetDeps` has to be used to specify the NuGet dependency file. Unfortunately, these cannot be deterministically fetched without a lockfile. This file should be generated using `nuget-to-nix` tool, which is available in nixpkgs.
|
||||
* `executables` is used to specify which executables get wrapped to `$out/bin`, relative to `$out/lib/$pname`. If this is unset, all executables generated will get installed. If you do not want to install any, set this to `[]`.
|
||||
* `runtimeDeps` is used to wrap libraries into `LD_LIBRARY_PATH`. This is how dotnet usually handles runtime dependencies.
|
||||
|
|
|
|||
|
|
@ -62,6 +62,8 @@ rec {
|
|||
‘type’: A module system type representing the module set as a submodule,
|
||||
to be extended by configuration from the containing module set.
|
||||
|
||||
This is also available as the module argument ‘moduleType’.
|
||||
|
||||
‘extendModules’: A function similar to ‘evalModules’ but building on top
|
||||
of the module set. Its arguments, ‘modules’ and ‘specialArgs’ are
|
||||
added to the existing values.
|
||||
|
|
@ -74,6 +76,8 @@ rec {
|
|||
override existing configuration fundamentally requires a new
|
||||
fixpoint to be constructed.
|
||||
|
||||
This is also available as a module argument.
|
||||
|
||||
‘_module’: A portion of the configuration tree which is elided from
|
||||
‘config’. It contains some values that are mostly internal to the
|
||||
module system implementation.
|
||||
|
|
@ -146,6 +150,7 @@ rec {
|
|||
config = {
|
||||
_module.args = {
|
||||
inherit extendModules;
|
||||
moduleType = type;
|
||||
} // args;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -281,6 +281,11 @@ checkConfigError 'A definition for option .fun.\[function body\]. is not of type
|
|||
checkConfigOutput "b a" config.result ./functionTo/list-order.nix
|
||||
checkConfigOutput "a c" config.result ./functionTo/merging-attrs.nix
|
||||
|
||||
# moduleType
|
||||
checkConfigOutput "a b" config.resultFoo ./declare-variants.nix ./define-variant.nix
|
||||
checkConfigOutput "a y z" config.resultFooBar ./declare-variants.nix ./define-variant.nix
|
||||
checkConfigOutput "a b c" config.resultFooFoo ./declare-variants.nix ./define-variant.nix
|
||||
|
||||
cat <<EOF
|
||||
====== module tests ======
|
||||
$pass Pass
|
||||
|
|
|
|||
9
lib/tests/modules/declare-variants.nix
Normal file
9
lib/tests/modules/declare-variants.nix
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{ lib, moduleType, ... }:
|
||||
let inherit (lib) mkOption types;
|
||||
in
|
||||
{
|
||||
options.variants = mkOption {
|
||||
type = types.lazyAttrsOf moduleType;
|
||||
default = {};
|
||||
};
|
||||
}
|
||||
22
lib/tests/modules/define-variant.nix
Normal file
22
lib/tests/modules/define-variant.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ config, lib, ... }:
|
||||
let inherit (lib) types mkOption attrNames;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
attrs = mkOption { type = types.attrsOf lib.types.int; };
|
||||
result = mkOption { };
|
||||
resultFoo = mkOption { };
|
||||
resultFooBar = mkOption { };
|
||||
resultFooFoo = mkOption { };
|
||||
};
|
||||
config = {
|
||||
attrs.a = 1;
|
||||
variants.foo.attrs.b = 1;
|
||||
variants.bar.attrs.y = 1;
|
||||
variants.foo.variants.bar.attrs.z = 1;
|
||||
variants.foo.variants.foo.attrs.c = 3;
|
||||
resultFoo = lib.concatMapStringsSep " " toString (attrNames config.variants.foo.attrs);
|
||||
resultFooBar = lib.concatMapStringsSep " " toString (attrNames config.variants.foo.variants.bar.attrs);
|
||||
resultFooFoo = lib.concatMapStringsSep " " toString (attrNames config.variants.foo.variants.foo.attrs);
|
||||
};
|
||||
}
|
||||
|
|
@ -5081,7 +5081,7 @@
|
|||
}];
|
||||
};
|
||||
ivankovnatsky = {
|
||||
email = "ikovnatsky@protonmail.ch";
|
||||
email = "75213+ivankovnatsky@users.noreply.github.com";
|
||||
github = "ivankovnatsky";
|
||||
githubId = 75213;
|
||||
name = "Ivan Kovnatsky";
|
||||
|
|
|
|||
|
|
@ -152,6 +152,7 @@ let
|
|||
serviceConfig = {
|
||||
# The service's only task is to ensure that the specified path exists
|
||||
Type = "oneshot";
|
||||
WorkingDirectory = cfg.path;
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -100,6 +100,7 @@ in
|
|||
serviceConfig = {
|
||||
User = config.users.users.gollum.name;
|
||||
Group = config.users.groups.gollum.name;
|
||||
WorkingDirectory = cfg.stateDir;
|
||||
ExecStart = ''
|
||||
${pkgs.gollum}/bin/gollum \
|
||||
--port ${toString cfg.port} \
|
||||
|
|
|
|||
|
|
@ -195,6 +195,7 @@ in {
|
|||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
|
||||
UMask = "0027";
|
||||
WorkingDirectory = "/var/lib/radicale";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ let
|
|||
pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql";
|
||||
|
||||
phpExt = pkgs.php74.withExtensions
|
||||
({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter ]);
|
||||
({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter opcache ]);
|
||||
in
|
||||
{
|
||||
# interface
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ let
|
|||
} ''
|
||||
install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz
|
||||
makeWrapper ${configured}/bin/xmonad $out/bin/xmonad \
|
||||
--set NIX_GHC "${xmonadEnv}/bin/ghc" \
|
||||
--set XMONAD_XMESSAGE "${pkgs.xorg.xmessage}/bin/xmessage"
|
||||
'';
|
||||
|
||||
|
|
@ -93,6 +92,8 @@ in {
|
|||
<literal>(restart "xmonad" True)</literal> instead, which will just restart
|
||||
xmonad from PATH. This allows e.g. switching to the new xmonad binary
|
||||
after rebuilding your system with nixos-rebuild.
|
||||
For the same reason, ghc is not added to the environment when this
|
||||
option is set.
|
||||
|
||||
If you actually want to run xmonad with a config specified here, but
|
||||
also be able to recompile and restart it from a copy of that source in
|
||||
|
|
|
|||
|
|
@ -244,19 +244,27 @@ def main() -> None:
|
|||
subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@"] + flags + ["install"])
|
||||
else:
|
||||
# Update bootloader to latest if needed
|
||||
systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[1]
|
||||
systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[2]
|
||||
sdboot_status = subprocess.check_output(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True)
|
||||
|
||||
# See status_binaries() in systemd bootctl.c for code which generates this
|
||||
m = re.search("^\W+File:.*/EFI/(BOOT|systemd)/.*\.efi \(systemd-boot (\d+)\)$",
|
||||
m = re.search("^\W+File:.*/EFI/(BOOT|systemd)/.*\.efi \(systemd-boot ([\d.]+[^)]*)\)$",
|
||||
sdboot_status, re.IGNORECASE | re.MULTILINE)
|
||||
|
||||
needs_install = False
|
||||
|
||||
if m is None:
|
||||
print("could not find any previously installed systemd-boot")
|
||||
print("could not find any previously installed systemd-boot, installing.")
|
||||
# Let systemd-boot attempt an installation if a previous one wasn't found
|
||||
needs_install = True
|
||||
else:
|
||||
sdboot_version = m.group(2)
|
||||
if systemd_version > sdboot_version:
|
||||
sdboot_version = f'({m.group(2)})'
|
||||
if systemd_version != sdboot_version:
|
||||
print("updating systemd-boot from %s to %s" % (sdboot_version, systemd_version))
|
||||
subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "update"])
|
||||
needs_install = True
|
||||
|
||||
if needs_install:
|
||||
subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "update"])
|
||||
|
||||
mkdir_p("@efiSysMountPoint@/efi/nixos")
|
||||
mkdir_p("@efiSysMountPoint@/loader/entries")
|
||||
|
|
|
|||
|
|
@ -67,6 +67,7 @@ let
|
|||
"systemd-user-sessions.service"
|
||||
"dbus-org.freedesktop.import1.service"
|
||||
"dbus-org.freedesktop.machine1.service"
|
||||
"dbus-org.freedesktop.login1.service"
|
||||
"user@.service"
|
||||
"user-runtime-dir@.service"
|
||||
|
||||
|
|
|
|||
|
|
@ -102,12 +102,12 @@ in
|
|||
machine.succeed(
|
||||
"""
|
||||
find /boot -iname '*.efi' -print0 | \
|
||||
xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot .* ####/#### LoaderInfo: systemd-boot 001 ####/' '{}'
|
||||
xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot .* ####/#### LoaderInfo: systemd-boot 000.0-1-notnixos ####/' '{}'
|
||||
"""
|
||||
)
|
||||
|
||||
output = machine.succeed("/run/current-system/bin/switch-to-configuration boot")
|
||||
assert "updating systemd-boot from 001 to " in output
|
||||
assert "updating systemd-boot from (000.0-1-notnixos) to " in output
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, cmake
|
||||
, curl
|
||||
, dbus
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, fetchFromGitHub
|
||||
, freeglut
|
||||
, freetype
|
||||
|
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||
brotli
|
||||
curl
|
||||
dbus
|
||||
epoxy
|
||||
libepoxy
|
||||
freeglut
|
||||
freetype
|
||||
gtk2-x11
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
, linuxHeaders
|
||||
, at-spi2-core
|
||||
, dbus
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, libXdmcp
|
||||
, libXtst
|
||||
, libpthreadstubs
|
||||
|
|
@ -143,7 +143,7 @@ stdenv.mkDerivation rec {
|
|||
] ++ optionals stdenv.isLinux [
|
||||
at-spi2-core
|
||||
dbus
|
||||
epoxy
|
||||
libepoxy
|
||||
libXdmcp
|
||||
libXtst
|
||||
libpthreadstubs
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitHub, pkg-config, cmake
|
||||
{ stdenv, lib, fetchFromGitHub, buildPackages, pkg-config, cmake
|
||||
, alsa-lib, glib, libjack2, libsndfile, libpulseaudio
|
||||
, AudioUnit, CoreAudio, CoreMIDI, CoreServices
|
||||
}:
|
||||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0x5808d03ym23np17nl8gfbkx3c4y3d7jyyr2222wn2prswbb6x3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ];
|
||||
|
||||
buildInputs = [ glib libsndfile libpulseaudio libjack2 ]
|
||||
++ lib.optionals stdenv.isLinux [ alsa-lib ]
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
, libpthreadstubs
|
||||
, libXdmcp
|
||||
, libxkbcommon
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, at-spi2-core
|
||||
, dbus
|
||||
, curl
|
||||
|
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||
libpthreadstubs
|
||||
libXdmcp
|
||||
libxkbcommon
|
||||
epoxy
|
||||
libepoxy
|
||||
at-spi2-core
|
||||
dbus
|
||||
curl
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, stdenv, fetchurl, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac
|
||||
{ config, lib, stdenv, fetchurl, fetchpatch, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac
|
||||
, usePulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -12,6 +12,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1c54lldr2imjzhlhq5lvwhj7d5794xm97cby9pznr5wdjjay0sa4";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix pending upstream inclusion for gcc-12 include headers:
|
||||
# https://github.com/OpenMPT/openmpt/pull/8
|
||||
(fetchpatch {
|
||||
name = "gcc-12.patch";
|
||||
url = "https://github.com/OpenMPT/openmpt/commit/6e7a43190ef2f9ba0b3efc19b9527261b69ec8f7.patch";
|
||||
sha256 = "081m1rf09bbrlg52aihaajmld5dcnwbp6y7zpyik92mm332r330h";
|
||||
})
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
, linuxHeaders
|
||||
, at-spi2-core
|
||||
, dbus
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, libXdmcp
|
||||
, libXtst
|
||||
, libpthreadstubs
|
||||
|
|
@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals stdenv.isLinux [
|
||||
at-spi2-core
|
||||
dbus
|
||||
epoxy
|
||||
libepoxy
|
||||
libXdmcp
|
||||
libXtst
|
||||
libpthreadstubs
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
, cmake
|
||||
, curl
|
||||
, dconf
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, ffmpeg
|
||||
, fftw
|
||||
, fftwFloat
|
||||
|
|
@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
|
|||
chromaprint
|
||||
curl
|
||||
dconf
|
||||
epoxy
|
||||
libepoxy
|
||||
ffmpeg
|
||||
fftw
|
||||
fftwFloat
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "electrs";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romanz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dYKSc5fU66fu+GdTeWQBrIOJAiBGdYAOS7MCto98Xss=";
|
||||
hash = "sha256-sTQ/dX1uXJkEmrNZ47qjBlrexO50y0NGNhw71rHc9bw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-M4H5tUbo1f18kk8S53saebSnZhZFr8udw41BUNJbQVI==";
|
||||
cargoHash = "sha256-1ZQt8LaqgxNxFfgCVCK0GVwbcVfX3v9iz7tHvzgyI0g=";
|
||||
|
||||
# needed for librocksdb-sys
|
||||
nativeBuildInputs = [ llvmPackages.clang ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchgit, pkg-config, linkFarm, lightdm-enso-os-greeter
|
||||
, dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
|
||||
, dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
|
||||
, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation {
|
|||
dbus
|
||||
gtk3
|
||||
pcre
|
||||
epoxy
|
||||
libepoxy
|
||||
libgee
|
||||
libX11
|
||||
lightdm
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm,
|
||||
boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkg-config, pcre,
|
||||
boost, libepoxy, cmake, aspell, llvmPackages, libgit2, pkg-config, pcre,
|
||||
libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3,
|
||||
coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
gtksourceview3
|
||||
at-spi2-core
|
||||
pcre
|
||||
epoxy
|
||||
libepoxy
|
||||
boost
|
||||
libXdmcp
|
||||
cmake
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
, curl
|
||||
, sane-backends
|
||||
, libXpm
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, poppler
|
||||
, mesa
|
||||
, lirc
|
||||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
sane-backends
|
||||
libdrm
|
||||
libXpm
|
||||
epoxy
|
||||
libepoxy
|
||||
poppler
|
||||
lirc
|
||||
mesa
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lightburn";
|
||||
version = "1.0.02";
|
||||
version = "1.0.04";
|
||||
|
||||
nativeBuildInputs = [
|
||||
p7zip
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
|
||||
sha256 = "sha256-JaKThw6ubutpOCsO1pVAPVxhhUTKpfYRHjBSu02nlN4=";
|
||||
sha256 = "sha256-3uuYxDxlBlu3/4BhII36s+PsLJCmHDIE3fRAz6GO/js=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, gtk4
|
||||
, zbar
|
||||
, tiffSupport ? true
|
||||
|
|
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
epoxy
|
||||
libepoxy
|
||||
gtk4
|
||||
zbar
|
||||
];
|
||||
|
|
|
|||
55
pkgs/applications/graphics/pixeluvo/default.nix
Normal file
55
pkgs/applications/graphics/pixeluvo/default.nix
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper
|
||||
, gtk3-x11 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pixeluvo";
|
||||
version = "1.6.0-2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.pixeluvo.com/downloads/${pname}_${version}_amd64.deb";
|
||||
sha256 = "sha256-QYSuD6o3kHg0DrFihYEcf9e3b8U1bu4Zf78+Akmm8yo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
makeWrapper
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3-x11
|
||||
stdenv.cc.cc
|
||||
];
|
||||
|
||||
libPath = lib.makeLibraryPath buildInputs;
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x ${src} ./
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mv usr $out
|
||||
mv opt $out
|
||||
install -Dm644 $out/opt/pixeluvo/pixeluvo.png -t $out/share/pixmaps/
|
||||
|
||||
substituteInPlace $out/share/applications/pixeluvo.desktop \
|
||||
--replace '/opt/pixeluvo/pixeluvo.png' pixeluvo
|
||||
|
||||
makeWrapper $out/opt/pixeluvo/bin/Pixeluvo64 $out/bin/pixeluvo \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Beautifully Designed Image and Photo Editor for Windows and Linux";
|
||||
homepage = "http://www.pixeluvo.com/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, epoxy
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, libepoxy
|
||||
, gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence, wrapGAppsHook
|
||||
}:
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
poppler pcre libxkbcommon epoxy
|
||||
poppler pcre libxkbcommon libepoxy
|
||||
freetype gtk3
|
||||
libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "soxr-0.1.3";
|
||||
pname = "soxr";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/soxr/${name}-Source.tar.xz";
|
||||
url = "mirror://sourceforge/soxr/soxr-${version}-Source.tar.xz";
|
||||
sha256 = "12aql6svkplxq5fjycar18863hcq84c5kx8g6f4rj0lcvigw24di";
|
||||
};
|
||||
|
||||
|
|
@ -15,18 +16,20 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "out" "doc" ]; # headers are just two and very small
|
||||
|
||||
preConfigure = if stdenv.isDarwin then ''
|
||||
export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}"`pwd`/build/src
|
||||
'' else ''
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}"`pwd`/build/src
|
||||
'';
|
||||
preConfigure =
|
||||
if stdenv.isDarwin then ''
|
||||
export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}"`pwd`/build/src
|
||||
'' else ''
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}"`pwd`/build/src
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "An audio resampling library";
|
||||
homepage = "http://soxr.sourceforge.net";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
, curl, writeShellScript, common-updater-scripts }:
|
||||
|
||||
let
|
||||
url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.2-328c666b/Hubstaff-1.6.2-328c666b.sh";
|
||||
version = "1.6.2-328c666b";
|
||||
sha256 = "0fmlblw19qk9s9xsl0dl705cnns825wrlc7navii4bvbsn6ycl5v";
|
||||
url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.3-b75e2da6/Hubstaff-1.6.3-b75e2da6.sh";
|
||||
version = "1.6.3-b75e2da6";
|
||||
sha256 = "0p77182p5rqbng8j6ndijq5br9hiwcmblpw8j5nc26m5w45jfspw";
|
||||
|
||||
rpath = lib.makeLibraryPath
|
||||
[ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ in buildFHSUserEnv {
|
|||
nasm sndio
|
||||
|
||||
# Snes9x
|
||||
epoxy minizip
|
||||
libepoxy minizip
|
||||
|
||||
# Vice
|
||||
bison flex
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
, proj
|
||||
, cairo
|
||||
, libxkbcommon
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, wrapGAppsHook
|
||||
, at-spi2-core
|
||||
, dbus
|
||||
|
|
@ -126,7 +126,7 @@ in stdenv.mkDerivation rec {
|
|||
libpthreadstubs
|
||||
libXdmcp
|
||||
libxkbcommon
|
||||
epoxy
|
||||
libepoxy
|
||||
at-spi2-core
|
||||
dbus
|
||||
];
|
||||
|
|
|
|||
|
|
@ -32,11 +32,24 @@ let
|
|||
url = "https://github.com/swaywm/wlroots/commit/e18599b05e0f0cbeba11adbd489e801285470eab.patch";
|
||||
sha256 = "17ax4dyk0584yhs3lq8ija5bkainjf7psx9c9r50cr4jm9c0i37l";
|
||||
})
|
||||
|
||||
# xwayland: Allow to retrieve _NET_STARTUP_ID
|
||||
(fetchpatch {
|
||||
name = "allow-to-retrieve-net-startup-id.patch";
|
||||
url = "https://github.com/swaywm/wlroots/commit/66593071bc90a1cccaeedc636eb6f33c973f5362.patch";
|
||||
sha256 = "sha256-yKf/twdUzrII5IakH7AH6LGyPDo9Nl/gIB0pTThSTfY=";
|
||||
})
|
||||
# xwayland: Allow to retrieve startup-id via _NET_STARTUP_INFO
|
||||
(fetchpatch {
|
||||
name = "allow-to-retrieve-startup-id-via-net-startup-info.patch";
|
||||
url = "https://github.com/swaywm/wlroots/commit/235bb6f2fcb8ee4174215ba74b5bc2f191c5960a.patch";
|
||||
sha256 = "sha256-7AWBq12tF/781CmgvTaOvTIiiJMywxRn6eWp+jacdak=";
|
||||
})
|
||||
];
|
||||
});
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "phoc";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
|
|
@ -44,7 +57,7 @@ in stdenv.mkDerivation rec {
|
|||
owner = "Phosh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QAnJlpFjWJvwxGyenmN4IaI9VFn2jwdXpa8VqAmH7Xw=";
|
||||
sha256 = "sha256-qd1ZETM2/AjU5nKQIqh0Q+SboLNr+NncvSHgLv2S3KI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
50
pkgs/applications/misc/thedesk/default.nix
Normal file
50
pkgs/applications/misc/thedesk/default.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron
|
||||
, alsa-lib, gtk3, libxshmfence, mesa, nss }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thedesk";
|
||||
version = "22.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb";
|
||||
sha256 = "sha256-5KB88zMgwfObgmcMTe6R+oG48qLHrMht6vM1EvI+QFY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ];
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x ${src} ./
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mv usr $out
|
||||
mv opt $out
|
||||
|
||||
substituteInPlace $out/share/applications/thedesk.desktop \
|
||||
--replace '/opt/TheDesk' $out/bin
|
||||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/thedesk \
|
||||
--add-flags $out/opt/TheDesk/resources/app.asar
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mastodon/Misskey Client for PC";
|
||||
homepage = "https://thedesk.top";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
, libva
|
||||
, libdrm, wayland, libxkbcommon # Ozone
|
||||
, curl
|
||||
, epoxy
|
||||
, libepoxy
|
||||
# postPatch:
|
||||
, glibc # gconv + locale
|
||||
|
||||
|
|
@ -150,7 +150,7 @@ let
|
|||
libva
|
||||
libdrm wayland mesa.drivers libxkbcommon
|
||||
curl
|
||||
epoxy
|
||||
libepoxy
|
||||
] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ]
|
||||
++ optional gnomeKeyringSupport libgnome-keyring3
|
||||
++ optionals cupsSupport [ libgcrypt cups ]
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloudflared";
|
||||
version = "2021.10.5";
|
||||
version = "2021.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
rev = version;
|
||||
sha256 = "sha256-vz7S6Qzr10Idy83ogMIHEHrjxGxxjtFnzNsuhbZqUnA=";
|
||||
sha256 = "sha256-amwzMSPMaXbIj95RhSVnl0kwHnEluKj4L7q4Zu2HPgE=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
@ -22,6 +22,6 @@ buildGoModule rec {
|
|||
homepage = "https://www.cloudflare.com/products/argo-tunnel";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.thoughtpolice maintainers.enorris ];
|
||||
maintainers = with maintainers; [ bbigras enorris thoughtpolice ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
56
pkgs/applications/networking/cluster/arkade/default.nix
Normal file
56
pkgs/applications/networking/cluster/arkade/default.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, kubectl
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.8.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
sha256 = "0jv6pip3ywx8bx7m25fby6kl5irnjxvlpss2wkm615gv9ari21aq";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
vendorSha256 = "05zdd5c2x4k4myxmgj32md8wq08i543l8q81rabqgyd3r9nwv4lx";
|
||||
|
||||
# Exclude pkg/get: tests downloading of binaries which fail when sandbox=true
|
||||
subPackages = [
|
||||
"."
|
||||
"cmd"
|
||||
"pkg/apps"
|
||||
"pkg/archive"
|
||||
"pkg/config"
|
||||
"pkg/env"
|
||||
"pkg/helm"
|
||||
"pkg/k8s"
|
||||
"pkg/types"
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X github.com/alexellis/arkade/cmd.GitCommit=ref/tags/${version}"
|
||||
"-X github.com/alexellis/arkade/cmd.Version=${version}"
|
||||
];
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/arkade" \
|
||||
--prefix PATH : ${lib.makeBinPath [ kubectl ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/alexellis/arkade";
|
||||
description = "Open Source Kubernetes Marketplace";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ welteki ];
|
||||
};
|
||||
}
|
||||
56
pkgs/applications/networking/cluster/driftctl/default.nix
Normal file
56
pkgs/applications/networking/cluster/driftctl/default.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "driftctl";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudskiff";
|
||||
repo = "driftctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rWC4jqquVWJmHV/dnH+DsxlNiAY01xnq9z0/owS4Yis=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-d8vASP8KnUeUkaHRU8kCE7FCt2QLGu5ET5BN3GM2O9c=";
|
||||
|
||||
postUnpack = ''
|
||||
# Without this, tests fail to locate aws/3.19.0.json
|
||||
for prefix in / \
|
||||
/pkg \
|
||||
/pkg/analyser \
|
||||
/pkg/alerter \
|
||||
/pkg/remote \
|
||||
/pkg/middlewares \
|
||||
/pkg/cmd/scan/output \
|
||||
/pkg/iac/terraform/state \
|
||||
/pkg/iac/supplier ; do
|
||||
mkdir -p ./source/$prefix/github.com/cloudskiff
|
||||
ln -sf $PWD/source ./source/$prefix/github.com/cloudskiff/driftctl
|
||||
done
|
||||
|
||||
# Disable check for latest version and telemetry, which are opt-out.
|
||||
# Making it out-in is quite a job, and why bother?
|
||||
find -name '*.go' \
|
||||
| xargs sed -i 's,https://2lvzgmrf2e.execute-api.eu-west-3.amazonaws.com/,https://0.0.0.0/,g'
|
||||
|
||||
# and remove corresponding flags from --help, so things look tidy.
|
||||
find -name driftctl.go | \
|
||||
xargs sed -i -e '/("no-version-check"/ d' -e '/("disable-telemetry"/ d'
|
||||
|
||||
# Presumably it can be done with ldflags, but I failed to find incantation
|
||||
# that would work, we here we go old-school.
|
||||
find -name version.go | xargs sed -i -e 's/"dev"/"${version}"/'
|
||||
find -name build.go | xargs sed -i -e 's/"dev"/"release"/'
|
||||
|
||||
# Fix the tests that checks for dev-dev.
|
||||
find -name version_test.go | xargs sed -i -e 's/"dev-dev/"${version}/'
|
||||
find -name driftctl_test.go | xargs sed -i -e 's/"dev-dev/"${version}/'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to track infrastructure drift";
|
||||
homepage = "https://github.com/cloudskiff/driftctl";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ kaction ];
|
||||
};
|
||||
}
|
||||
|
|
@ -61,7 +61,7 @@ GEM
|
|||
multi_json
|
||||
to_regexp (~> 0.2.1)
|
||||
jwt (2.3.0)
|
||||
krane (2.3.1)
|
||||
krane (2.3.2)
|
||||
activesupport (>= 5.0)
|
||||
colorize (~> 0.8)
|
||||
concurrent-ruby (~> 1.1)
|
||||
|
|
@ -77,7 +77,7 @@ GEM
|
|||
recursive-open-struct (~> 1.1, >= 1.1.1)
|
||||
rest-client (~> 2.0)
|
||||
memoist (0.16.2)
|
||||
mime-types (3.4.0)
|
||||
mime-types (3.4.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2021.1115)
|
||||
minitest (5.14.4)
|
||||
|
|
|
|||
|
|
@ -276,10 +276,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0k1lwg0d2phs9n9zdx7nv5rv2p2vipm9jgzalr8x9nrq1is6wgvr";
|
||||
sha256 = "0x908645i92w012xglc07lb6k2irn1zpzwgn1n99h2x54qk1pz4v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
};
|
||||
kubeclient = {
|
||||
dependencies = ["http" "recursive-open-struct" "rest-client"];
|
||||
|
|
@ -308,10 +308,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wvbwlkf6i17xvxx70cffw26ijvcc400vfhpbnvd8mmx556cnb4g";
|
||||
sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
};
|
||||
mime-types-data = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
homepage =
|
||||
"https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html";
|
||||
description = "Amazon SSM Session Manager Plugin";
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ mbaillie ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
{ stdenv, lib, fetchurl, unzip, makeDesktopItem, copyDesktopItems
|
||||
, makeWrapper, electron }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "indigenous-desktop";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/marksuth/indigenous-desktop/releases/download/v${version}/indigenous-linux-x64-${version}.zip";
|
||||
sha256 = "sha256-1nqj9N5RQE0PogJSULu75CTVLHeQsHIimtFXSCP6SPA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
unzip
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = pname;
|
||||
exec = "indigenous-desktop";
|
||||
icon = "indigenous-desktop";
|
||||
comment = meta.description;
|
||||
desktopName = "Indigenous";
|
||||
genericName = "Feed Reader";
|
||||
})
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/opt/indigenous $out/share/indigenous $out/share/pixmaps
|
||||
cp -r ./ $out/opt/indigenous
|
||||
mv $out/opt/indigenous/{locales,resources} $out/share/indigenous
|
||||
mv $out/share/indigenous/resources/app/images/icon.png $out/share/pixmaps/indigenous-desktop.png
|
||||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/indigenous-desktop \
|
||||
--add-flags $out/share/indigenous/resources/app
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "IndieWeb app with extensions for sharing to/reading from micropub endpoints";
|
||||
homepage = "https://indigenous.realize.be/indigenous-desktop";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
, libnotify, libsoup, libgee
|
||||
, librsvg, libsignal-protocol-c
|
||||
, libgcrypt
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, at-spi2-core
|
||||
, sqlite
|
||||
, dbus
|
||||
|
|
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
|||
libgcrypt
|
||||
libsoup
|
||||
pcre
|
||||
epoxy
|
||||
libepoxy
|
||||
at-spi2-core
|
||||
dbus
|
||||
icu
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
|
|||
stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype
|
||||
gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
|
||||
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
|
||||
libXtst nspr nss libxcb pango systemd libXScrnSaver
|
||||
libXtst nspr nss libxcb pango libXScrnSaver
|
||||
libappindicator-gtk3 libdbusmenu
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3
|
||||
, tl-expected, hunspell, glibmm, webkitgtk
|
||||
# Transitive dependencies:
|
||||
, pcre, xorg, util-linux, libselinux, libsepol, epoxy
|
||||
, pcre, xorg, util-linux, libselinux, libsepol, libepoxy
|
||||
, at-spi2-core, libXtst, libthai, libdatrie
|
||||
}:
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ in mkDerivation rec {
|
|||
tl-expected hunspell glibmm webkitgtk
|
||||
tg_owt
|
||||
# Transitive dependencies:
|
||||
pcre xorg.libXdmcp util-linux libselinux libsepol epoxy
|
||||
pcre xorg.libXdmcp util-linux libselinux libsepol libepoxy
|
||||
at-spi2-core libXtst libthai libdatrie
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
, libXdmcp
|
||||
, libselinux
|
||||
, libsepol
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, at-spi2-core
|
||||
, libXtst
|
||||
, libthai
|
||||
|
|
@ -135,7 +135,7 @@ mkDerivation rec {
|
|||
libXdmcp
|
||||
libselinux
|
||||
libsepol
|
||||
epoxy
|
||||
libepoxy
|
||||
at-spi2-core
|
||||
libXtst
|
||||
libthai
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, libX11
|
||||
, gst_all_1
|
||||
, sqlite
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, pango
|
||||
, cairo
|
||||
, gdk-pixbuf
|
||||
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
pcsclite
|
||||
gtk3
|
||||
cairo
|
||||
epoxy
|
||||
libepoxy
|
||||
pango
|
||||
gdk-pixbuf
|
||||
gst_all_1.gstreamer
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, freerdp, libssh, libgcrypt, gnutls
|
||||
, pcre2, libdbusmenu-gtk3, libappindicator-gtk3
|
||||
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
|
||||
, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core
|
||||
, libsecret, libsoup, spice-protocol, spice-gtk, libepoxy, at-spi2-core
|
||||
, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz
|
||||
# The themes here are soft dependencies; only icons are missing without them.
|
||||
, gnome
|
||||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
freerdp libssh libgcrypt gnutls
|
||||
pcre2 libdbusmenu-gtk3 libappindicator-gtk3
|
||||
libvncserver libpthreadstubs libXdmcp libxkbcommon
|
||||
libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core
|
||||
libsecret libsoup spice-protocol spice-gtk libepoxy at-spi2-core
|
||||
openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk
|
||||
harfbuzz
|
||||
];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
|
||||
, librevenge, libe-book, libmwaw, glm, gst_all_1
|
||||
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
|
||||
, gnome, glib, ncurses, epoxy, gpgme
|
||||
, gnome, glib, ncurses, libepoxy, gpgme
|
||||
, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ]
|
||||
, withHelp ? true
|
||||
, kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null
|
||||
|
|
@ -396,7 +396,7 @@ in (mkDrv rec {
|
|||
python3 sane-backends unzip which zip zlib
|
||||
mdds bluez5 libwps libabw libzmf
|
||||
libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux
|
||||
librevenge libe-book libmwaw glm ncurses epoxy
|
||||
librevenge libe-book libmwaw glm ncurses libepoxy
|
||||
libodfgen CoinMP librdf_rasqal gnome.adwaita-icon-theme gettext
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "zk";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mickael-menu";
|
||||
repo = "zk";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-C3/V4v8lH4F3S51egEw5d51AI0n5xzBQjwhrI64FEGA=";
|
||||
sha256 = "sha256-lTg5jB3krZWmCn3wWoAwzqBji1AyTTTVf/BphC7Mr5s=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-m7QGv8Vx776TsN7QHXtO+yl3U1D573UMZVyg1B4UeIk=";
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
}:
|
||||
python2.pkgs.buildPythonApplication rec {
|
||||
pname = "chirp-daily";
|
||||
version = "20210724";
|
||||
version = "20211016";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0wddzls7r0l5b8vvljnmrj5lmmp7zkzl4h73pyigyf9nbhaklybb";
|
||||
sha256 = "13xzqnhvnw6yipv4izkq0s9ykyl9pc5ifpr1ii8xfp28ch706qyw";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python2.pkgs; [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, coreutils
|
||||
, cppzmq
|
||||
, curl
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, fetchFromGitHub
|
||||
, glm
|
||||
, gtkmm3
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
cppzmq
|
||||
curl
|
||||
epoxy
|
||||
libepoxy
|
||||
glm
|
||||
gtkmm3
|
||||
libgit2
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
, libthai
|
||||
, libdatrie
|
||||
, libxkbcommon
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, dbus
|
||||
, at-spi2-core
|
||||
, libXtst
|
||||
|
|
@ -131,7 +131,7 @@ stdenv.mkDerivation rec {
|
|||
libthai
|
||||
libdatrie
|
||||
libxkbcommon
|
||||
epoxy
|
||||
libepoxy
|
||||
dbus.daemon
|
||||
at-spi2-core
|
||||
libXtst
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchFromGitHub
|
||||
{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, libepoxy, fetchFromGitHub
|
||||
, glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs
|
||||
, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2
|
||||
, pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs =
|
||||
[ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp
|
||||
util-linuxMinimal glib docbook_xsl xmlto libselinux
|
||||
libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit
|
||||
libsepol libxkbcommon libepoxy at-spi2-core libXtst libtasn1 p11-kit
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ fetchurl, lib, stdenv, buildPackages
|
||||
, curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio
|
||||
, gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
|
||||
, openssh, pcre2
|
||||
, openssh, pcre2, bash
|
||||
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
|
||||
, libxslt, tcl, tk, makeWrapper, libiconv
|
||||
, svnSupport, subversionClient, perlLibs, smtpPerlLibs
|
||||
|
|
@ -73,7 +73,7 @@ stdenv.mkDerivation {
|
|||
nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ]
|
||||
++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
|
||||
docbook_xsl docbook_xml_dtd_45 libxslt ];
|
||||
buildInputs = [curl openssl zlib expat cpio libiconv]
|
||||
buildInputs = [ curl openssl zlib expat cpio libiconv bash ]
|
||||
++ lib.optionals perlSupport [ perlPackages.perl ]
|
||||
++ lib.optionals guiSupport [tcl tk]
|
||||
++ lib.optionals withpcre2 [ pcre2 ]
|
||||
|
|
@ -84,11 +84,12 @@ stdenv.mkDerivation {
|
|||
NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s"
|
||||
+ lib.optionalString (stdenv.isFreeBSD) "-lthr";
|
||||
|
||||
configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
configureFlags = [
|
||||
"ac_cv_prog_CURL_CONFIG=${lib.getDev curl}/bin/curl-config"
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"ac_cv_fread_reads_directories=yes"
|
||||
"ac_cv_snprintf_returns_bogus=no"
|
||||
"ac_cv_iconv_omits_bom=no"
|
||||
"ac_cv_prog_CURL_CONFIG=${curl.dev}/bin/curl-config"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
|
@ -97,8 +98,10 @@ stdenv.mkDerivation {
|
|||
|
||||
makeFlags = [
|
||||
"prefix=\${out}"
|
||||
"SHELL_PATH=${stdenv.shell}"
|
||||
]
|
||||
# Git does not allow setting a shell separately for building and run-time.
|
||||
# Therefore lets leave it at the default /bin/sh when cross-compiling
|
||||
++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "SHELL_PATH=${stdenv.shell}"
|
||||
++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"])
|
||||
++ (if pythonSupport then ["PYTHON_PATH=${python3}/bin/python"] else ["NO_PYTHON=1"])
|
||||
++ lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="]
|
||||
|
|
@ -115,6 +118,10 @@ stdenv.mkDerivation {
|
|||
# See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706
|
||||
++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent";
|
||||
|
||||
disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
stdenv.shellPackage
|
||||
];
|
||||
|
||||
|
||||
postBuild = ''
|
||||
make -C contrib/subtree
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "glitter";
|
||||
version = "1.5.5";
|
||||
version = "1.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "milo123459";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4BN2kE9PkPFnFuk2Hl2WAhbvdkiO9yg4i0422ZQhJig=";
|
||||
sha256 = "sha256-RP/8E2wqEFArWrZ1nfDhTKt2Ak1bl6PhalaHcQobfTk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-b+xd7Uq6sVcvbILEWKRylEnfNbQkeO/T2IoWzoReEM8=";
|
||||
cargoSha256 = "sha256-6OGkcTGKCMgxMFDJ625NeVmKjRRwiRkQdE+oXRN3FHw=";
|
||||
|
||||
# tests require it to be in a git repository
|
||||
preCheck = ''
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, gettext
|
||||
, glib
|
||||
, gtk3
|
||||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
wrapGAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
epoxy
|
||||
libepoxy
|
||||
glib
|
||||
gtk3
|
||||
mpv
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
, at-spi2-core
|
||||
, dbus
|
||||
, elfutils
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, gexiv2
|
||||
, glib
|
||||
, gobject-introspection
|
||||
|
|
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
at-spi2-core
|
||||
dbus
|
||||
epoxy
|
||||
libepoxy
|
||||
elfutils
|
||||
gexiv2
|
||||
glib
|
||||
|
|
|
|||
|
|
@ -1,28 +1,40 @@
|
|||
{ lib, fetchFromGitHub, appstream-glib, desktop-file-utils, glib
|
||||
, gobject-introspection, gst_all_1, gtk4, libadwaita, librsvg, meson, ninja
|
||||
, pkg-config, python3, wrapGAppsHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gst_all_1
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, libpulseaudio
|
||||
, librsvg
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, rustPlatform
|
||||
, wayland
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kooha";
|
||||
version = "1.2.1";
|
||||
format = "other";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SeaDve";
|
||||
repo = "Kooha";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qwbzdn0n1nxcfci1bhhkfchdhw5yz74fdvsa84cznyyx2jils8w";
|
||||
sha256 = "05ynpwjdpl7zp9f17zhhvb59rbz3gd7hc0amla1g85ldgfxbgl00";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gobject-introspection
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gtk4
|
||||
libadwaita
|
||||
librsvg
|
||||
];
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256:16zf6vb001z7xdv2g4kpmb2vqsmaql2cpsx1rl9zrfhpl2z6frs9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
|
|
@ -31,21 +43,31 @@ python3.pkgs.buildPythonApplication rec {
|
|||
ninja
|
||||
python3
|
||||
pkg-config
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.rust.cargo
|
||||
rustPlatform.rust.rustc
|
||||
wayland
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gobject-introspection
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gtk4
|
||||
libadwaita
|
||||
libpulseaudio
|
||||
librsvg
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ python3.pkgs.pygobject3 ];
|
||||
|
||||
strictDeps = false;
|
||||
|
||||
buildPhase = ''
|
||||
export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0"
|
||||
'';
|
||||
|
||||
# Fixes https://github.com/NixOS/nixpkgs/issues/31168
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson/postinstall.py
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
patchShebangs build-aux/meson_post_install.py
|
||||
'';
|
||||
|
||||
installCheckPhase = ''
|
||||
|
|
|
|||
|
|
@ -122,11 +122,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
# Avoid Qt 5.12 problem on Big Sur: https://bugreports.qt.io/browse/QTBUG-87014
|
||||
qtWrapperArgs = lib.optionals stdenv.isDarwin [
|
||||
"--set QT_MAC_WANTS_LAYER 1"
|
||||
];
|
||||
|
||||
postFixup = optionalString withGUI ''
|
||||
wrapQtApp $out/bin/mkvtoolnix-gui
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -79,6 +79,8 @@ let
|
|||
rm "$out/Applications/mpv.app/Contents/MacOS/mpv"
|
||||
makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs}
|
||||
'';
|
||||
|
||||
meta.mainProgram = "mpv";
|
||||
};
|
||||
in
|
||||
lib.makeOverridable wrapper
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
, xenSupport ? false, xen
|
||||
, cephSupport ? false, ceph
|
||||
, glusterfsSupport ? false, glusterfs, libuuid
|
||||
, openGLSupport ? sdlSupport, mesa, epoxy, libdrm
|
||||
, openGLSupport ? sdlSupport, mesa, libepoxy, libdrm
|
||||
, virglSupport ? openGLSupport, virglrenderer
|
||||
, libiscsiSupport ? true, libiscsi
|
||||
, smbdSupport ? false, samba
|
||||
|
|
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optionals xenSupport [ xen ]
|
||||
++ lib.optionals cephSupport [ ceph ]
|
||||
++ lib.optionals glusterfsSupport [ glusterfs libuuid ]
|
||||
++ lib.optionals openGLSupport [ mesa epoxy libdrm ]
|
||||
++ lib.optionals openGLSupport [ mesa libepoxy libdrm ]
|
||||
++ lib.optionals virglSupport [ virglrenderer ]
|
||||
++ lib.optionals libiscsiSupport [ libiscsi ]
|
||||
++ lib.optionals smbdSupport [ samba ]
|
||||
|
|
@ -112,6 +112,12 @@ stdenv.mkDerivation rec {
|
|||
url = "https://gitlab.com/qemu-project/qemu/-/commit/13a028336f2c05e7ff47dfdaf30dfac7f4883e80.patch";
|
||||
sha256 = "sha256-23xVixVl+JDBNdhe5j5WY8CB4MsnUo+sjrkAkG+JS6M=";
|
||||
})
|
||||
# Fixes managedsave (snapshot creation) with QXL video device. Remove with next release.
|
||||
(fetchpatch {
|
||||
name = "qxl-fix-pre-save-logic.patch";
|
||||
url = "https://gitlab.com/qemu-project/qemu/-/commit/eb94846280df3f1e2a91b6179fc05f9890b7e384.patch";
|
||||
sha256 = "sha256-p31fd47RTSw928DOMrubQQybnzDAGm23z4Yhe+hGJQ8=";
|
||||
})
|
||||
] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch
|
||||
++ lib.optionals stdenv.hostPlatform.isMusl [
|
||||
./sigrtminmax.patch
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config makeWrapper meson ninja installShellFiles
|
||||
pkg-config makeWrapper meson ninja installShellFiles perl
|
||||
asciidoc xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "phosh";
|
||||
version = "0.13.1";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects
|
||||
sha256 = "sha256-dKQK4mGe/dvNlca/XMDeq1Q4dH/WBF/rtiUh8RssF5c=";
|
||||
sha256 = "sha256-pN2IWJDsQoTSOUki5gKhIucFYlYchzrqKHQYq6o4EkI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
# Unfortunately, dotnet has no method for doing this automatically.
|
||||
# If unset, all executables in the projects root will get installed. This may cause bloat!
|
||||
, executables ? null
|
||||
# The packages project file, which contains instructions on how to compile it.
|
||||
# The packages project file, which contains instructions on how to compile it. This can be an array of multiple project files as well.
|
||||
, projectFile ? null
|
||||
# The NuGet dependency file. This locks all NuGet dependency versions, as otherwise they cannot be deterministically fetched.
|
||||
# This can be generated using the `nuget-to-nix` tool.
|
||||
|
|
@ -102,13 +102,15 @@ let
|
|||
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
dotnet restore "$projectFile" \
|
||||
${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \
|
||||
-p:ContinuousIntegrationBuild=true \
|
||||
-p:Deterministic=true \
|
||||
--source "${nuget-source}/lib" \
|
||||
"''${dotnetRestoreFlags[@]}" \
|
||||
"''${dotnetFlags[@]}"
|
||||
for project in ''${projectFile[@]}; do
|
||||
dotnet restore "$project" \
|
||||
${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \
|
||||
-p:ContinuousIntegrationBuild=true \
|
||||
-p:Deterministic=true \
|
||||
--source "${nuget-source}/lib" \
|
||||
"''${dotnetRestoreFlags[@]}" \
|
||||
"''${dotnetFlags[@]}"
|
||||
done
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
|
@ -116,16 +118,18 @@ let
|
|||
buildPhase = args.buildPhase or ''
|
||||
runHook preBuild
|
||||
|
||||
dotnet build "$projectFile" \
|
||||
-maxcpucount:${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} \
|
||||
-p:BuildInParallel=${if enableParallelBuilding then "true" else "false"} \
|
||||
-p:ContinuousIntegrationBuild=true \
|
||||
-p:Deterministic=true \
|
||||
-p:Version=${args.version} \
|
||||
--configuration "$buildType" \
|
||||
--no-restore \
|
||||
"''${dotnetBuildFlags[@]}" \
|
||||
"''${dotnetFlags[@]}"
|
||||
for project in ''${projectFile[@]}; do
|
||||
dotnet build "$project" \
|
||||
-maxcpucount:${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} \
|
||||
-p:BuildInParallel=${if enableParallelBuilding then "true" else "false"} \
|
||||
-p:ContinuousIntegrationBuild=true \
|
||||
-p:Deterministic=true \
|
||||
-p:Version=${args.version} \
|
||||
--configuration "$buildType" \
|
||||
--no-restore \
|
||||
"''${dotnetBuildFlags[@]}" \
|
||||
"''${dotnetFlags[@]}"
|
||||
done
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
|
@ -133,16 +137,18 @@ let
|
|||
checkPhase = args.checkPhase or ''
|
||||
runHook preCheck
|
||||
|
||||
${lib.getBin dotnet-test-sdk}/bin/dotnet test "$testProjectFile" \
|
||||
-maxcpucount:${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} \
|
||||
-p:ContinuousIntegrationBuild=true \
|
||||
-p:Deterministic=true \
|
||||
--configuration "$buildType" \
|
||||
--no-build \
|
||||
--logger "console;verbosity=normal" \
|
||||
${lib.optionalString (disabledTests != []) "--filter \"FullyQualifiedName!=${lib.concatStringsSep "|FullyQualifiedName!=" disabledTests}\""} \
|
||||
"''${dotnetTestFlags[@]}" \
|
||||
"''${dotnetFlags[@]}"
|
||||
for project in ''${testProjectFile[@]}; do
|
||||
${lib.getBin dotnet-test-sdk}/bin/dotnet test "$project" \
|
||||
-maxcpucount:${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} \
|
||||
-p:ContinuousIntegrationBuild=true \
|
||||
-p:Deterministic=true \
|
||||
--configuration "$buildType" \
|
||||
--no-build \
|
||||
--logger "console;verbosity=normal" \
|
||||
${lib.optionalString (disabledTests != []) "--filter \"FullyQualifiedName!=${lib.concatStringsSep "&FullyQualifiedName!=" disabledTests}\""} \
|
||||
"''${dotnetTestFlags[@]}" \
|
||||
"''${dotnetFlags[@]}"
|
||||
done
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
|
@ -150,15 +156,17 @@ let
|
|||
installPhase = args.installPhase or ''
|
||||
runHook preInstall
|
||||
|
||||
dotnet publish "$projectFile" \
|
||||
-p:ContinuousIntegrationBuild=true \
|
||||
-p:Deterministic=true \
|
||||
--output $out/lib/${args.pname} \
|
||||
--configuration "$buildType" \
|
||||
--no-build \
|
||||
--no-self-contained \
|
||||
"''${dotnetInstallFlags[@]}" \
|
||||
"''${dotnetFlags[@]}"
|
||||
for project in ''${projectFile[@]}; do
|
||||
dotnet publish "$project" \
|
||||
-p:ContinuousIntegrationBuild=true \
|
||||
-p:Deterministic=true \
|
||||
--output $out/lib/${args.pname} \
|
||||
--configuration "$buildType" \
|
||||
--no-build \
|
||||
--no-self-contained \
|
||||
"''${dotnetInstallFlags[@]}" \
|
||||
"''${dotnetFlags[@]}"
|
||||
done
|
||||
'' + (if executables != null then ''
|
||||
for executable in $executables; do
|
||||
execPath="$out/lib/${args.pname}/$executable"
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ function getRole() {
|
|||
role_post='_FOR_TARGET'
|
||||
;;
|
||||
*)
|
||||
echo "@name@: used as improper sort of dependency" >2
|
||||
echo "@name@: used as improper sort of dependency" >&2
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
|
|
@ -64,7 +64,7 @@ function getTargetRoleWrapper() {
|
|||
export NIX_@wrapperName@_TARGET_TARGET_@suffixSalt@=1
|
||||
;;
|
||||
*)
|
||||
echo "@name@: used as improper sort of dependency" >2
|
||||
echo "@name@: used as improper sort of dependency" >&2
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@ mangleVarListGeneric() {
|
|||
local -a role_suffixes=("$@")
|
||||
|
||||
local outputVar="${var}_@suffixSalt@"
|
||||
declare -gx ${outputVar}+=''
|
||||
declare -gx "$outputVar"+=''
|
||||
# For each role we serve, we accumulate the input parameters into our own
|
||||
# cc-wrapper-derivation-specific environment variables.
|
||||
for suffix in "${role_suffixes[@]}"; do
|
||||
local inputVar="${var}${suffix}"
|
||||
if [ -v "$inputVar" ]; then
|
||||
export ${outputVar}+="${!outputVar:+$sep}${!inputVar}"
|
||||
export "${outputVar}+=${!outputVar:+$sep}${!inputVar}"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
|
@ -42,7 +42,7 @@ mangleVarBool() {
|
|||
local -a role_suffixes=("$@")
|
||||
|
||||
local outputVar="${var}_@suffixSalt@"
|
||||
declare -gxi ${outputVar}+=0
|
||||
declare -gxi "${outputVar}+=0"
|
||||
for suffix in "${role_suffixes[@]}"; do
|
||||
local inputVar="${var}${suffix}"
|
||||
if [ -v "$inputVar" ]; then
|
||||
|
|
@ -131,7 +131,7 @@ expandResponseParams() {
|
|||
}
|
||||
|
||||
checkLinkType() {
|
||||
local arg mode
|
||||
local arg
|
||||
type="dynamic"
|
||||
for arg in "$@"; do
|
||||
if [[ "$arg" = -static ]]; then
|
||||
|
|
@ -146,7 +146,7 @@ checkLinkType() {
|
|||
# When building static-pie executables we cannot have rpath
|
||||
# set. At least glibc requires rpath to be empty
|
||||
filterRpathFlags() {
|
||||
local linkType=$1 ret="" i
|
||||
local linkType=$1 ret i
|
||||
shift
|
||||
|
||||
if [[ "$linkType" == "static-pie" ]]; then
|
||||
|
|
@ -156,11 +156,11 @@ filterRpathFlags() {
|
|||
# also skip its argument
|
||||
shift
|
||||
else
|
||||
ret+="$i "
|
||||
ret+=("$i")
|
||||
fi
|
||||
done
|
||||
else
|
||||
ret=$@
|
||||
ret=("$@")
|
||||
fi
|
||||
echo $ret
|
||||
echo "${ret[@]}"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ddccontrol-db";
|
||||
version = "20210804";
|
||||
version = "20210812";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddccontrol";
|
||||
repo = "ddccontrol-db";
|
||||
rev = version;
|
||||
sha256 = "sha256-+PTw4bDJhWyuEae5ShkIL/KvQ29+gU46iE2RdtTWb8M=";
|
||||
sha256 = "sha256-dRqyjDC9yNkNOnYQ9fkWPlnyzSqIZ4zxZ2T7t8Bu9FE=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
let
|
||||
pname = "publicsuffix-list";
|
||||
version = "2019-05-24";
|
||||
version = "2021-09-03";
|
||||
in fetchFromGitHub {
|
||||
name = "${pname}-${version}";
|
||||
owner = "publicsuffix";
|
||||
repo = "list";
|
||||
rev = "a1db0e898956e126de65be1a5e977fbbbbeebe33";
|
||||
sha256 = "092153w2jr7nx28p9wc9k6b5azi9c39ghnqfnfiwfzv1j8jm3znq";
|
||||
rev = "2533d032871e1ef1f410fc0754b848d4587c8021";
|
||||
sha256 = "sha256-Q8uIXM1CMu8dlWcVoL17M1XRGu3kG7Y7jpx0oHQh+2I=";
|
||||
|
||||
postFetch = ''
|
||||
tar xf $downloadedFile --strip=1
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
let
|
||||
generator = buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20211103073737";
|
||||
version = "20211119143108";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
sha256 = "sha256-NYgEXbow16w+XMRjbQG1cIn/BjPbbcj+uzb4kcVR6eI=";
|
||||
sha256 = "sha256-CJMINkutaUI/Eka0OJTjeG3weTMYaNKdB2BWOxFgI3s=";
|
||||
};
|
||||
vendorSha256 = "sha256-JuLU9v1ukVfAEtz07tGk66st1+sO4SBz83BlK3IPQwU=";
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, arcan
|
||||
, audit
|
||||
, dbus
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, fontutil
|
||||
, libGL
|
||||
, libX11
|
||||
|
|
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
|||
arcan
|
||||
audit
|
||||
dbus
|
||||
epoxy
|
||||
libepoxy
|
||||
fontutil
|
||||
libGL
|
||||
libX11
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
, tzdata
|
||||
, udisks2
|
||||
, upower
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, gnome-user-share
|
||||
, gnome-remote-desktop
|
||||
, wrapGAppsHook
|
||||
|
|
@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
|
|||
clutter-gtk
|
||||
colord
|
||||
colord-gtk
|
||||
epoxy
|
||||
libepoxy
|
||||
fontconfig
|
||||
gdk-pixbuf
|
||||
glib
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome, glib, gtk3, gsettings-desktop-schemas
|
||||
, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
|
||||
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }:
|
||||
, libxslt, gettext, makeWrapper, systemd, xorg, libepoxy, gnugrep, bash, gnome-session-ctl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-session";
|
||||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome.adwaita-icon-theme
|
||||
gnome.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy
|
||||
gnome.gnome-settings-daemon gsettings-desktop-schemas systemd libepoxy
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
, gtk3
|
||||
, harfbuzz
|
||||
, ninja
|
||||
, epoxy
|
||||
, libepoxy
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
gdk-pixbuf
|
||||
librsvg
|
||||
webkitgtk_4_1
|
||||
epoxy
|
||||
libepoxy
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
|
|
|
|||
|
|
@ -55,8 +55,6 @@ let
|
|||
];
|
||||
|
||||
in rec {
|
||||
inherit buildShellExtension;
|
||||
|
||||
gnome38Extensions = mapUuidNames (produceExtensionsList "38");
|
||||
gnome40Extensions = mapUuidNames (produceExtensionsList "40");
|
||||
gnome41Extensions = mapUuidNames (produceExtensionsList "41");
|
||||
|
|
@ -79,6 +77,8 @@ in rec {
|
|||
mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md";
|
||||
remove-dropdown-arrows = throw "gnomeExtensions.remove-dropdown-arrows removed since 2021-05-25: The extensions has not seen an update sine GNOME 3.34. Furthermore, the functionality it provides is obsolete as of GNOME 40.";
|
||||
})
|
||||
# Export buildShellExtension function
|
||||
(extensions: extensions // { inherit buildShellExtension; })
|
||||
# Make the set "public"
|
||||
lib.recurseIntoAttrs
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd,
|
||||
libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate,
|
||||
libSM, libXtst, gtk3, libepoxy, polkit, hicolor-icon-theme, mate,
|
||||
wrapGAppsHook, fetchpatch, mateUpdateScript
|
||||
}:
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
gtk3
|
||||
mate.mate-desktop
|
||||
hicolor-icon-theme
|
||||
epoxy
|
||||
libepoxy
|
||||
polkit
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
mkDerivation, lib,
|
||||
extra-cmake-modules, kdoctools, fetchpatch,
|
||||
|
||||
epoxy, lcms2, libICE, libSM, libcap, libdrm, libinput, libxkbcommon, mesa,
|
||||
libepoxy, lcms2, libICE, libSM, libcap, libdrm, libinput, libxkbcommon, mesa,
|
||||
pipewire, udev, wayland, xcb-util-cursor, xwayland,
|
||||
|
||||
qtdeclarative, qtmultimedia, qtquickcontrols2, qtscript, qtsensors,
|
||||
|
|
@ -21,7 +21,7 @@ mkDerivation {
|
|||
name = "kwin";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
epoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire
|
||||
libepoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire
|
||||
udev wayland xcb-util-cursor xwayland
|
||||
|
||||
qtdeclarative qtmultimedia qtquickcontrols2 qtscript qtsensors
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, gettext, kdoctools,
|
||||
cups, epoxy, mesa, pcre, pipewire, wayland, wayland-protocols,
|
||||
cups, libepoxy, mesa, pcre, pipewire, wayland, wayland-protocols,
|
||||
kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem,
|
||||
kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio,
|
||||
qtbase
|
||||
|
|
@ -11,7 +11,7 @@ mkDerivation {
|
|||
name = "xdg-desktop-portal-kde";
|
||||
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ];
|
||||
buildInputs = [
|
||||
cups epoxy mesa pcre pipewire wayland wayland-protocols
|
||||
cups libepoxy mesa pcre pipewire wayland wayland-protocols
|
||||
|
||||
kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem
|
||||
kirigami2 kdeclarative plasma-framework plasma-wayland-protocols
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, mkXfceDerivation, gobject-introspection, vala, gtk3, libICE, libSM
|
||||
, libstartup_notification, libgtop, epoxy, libxfce4util, xfconf }:
|
||||
, libstartup_notification, libgtop, libepoxy, libxfce4util, xfconf }:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
|
|
@ -9,7 +9,7 @@ mkXfceDerivation {
|
|||
sha256 = "sha256-5mwyC3YA1LvdVSvaHN7CXDJh+IXjmdHGLKzhpjtUZkw=";
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection vala ];
|
||||
buildInputs = [ gtk3 libstartup_notification libgtop epoxy xfconf ];
|
||||
buildInputs = [ gtk3 libstartup_notification libgtop libepoxy xfconf ];
|
||||
propagatedBuildInputs = [ libxfce4util libICE libSM ];
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ mkXfceDerivation, exo, librsvg, dbus-glib, epoxy, gtk3, libXdamage
|
||||
{ mkXfceDerivation, exo, librsvg, dbus-glib, libepoxy, gtk3, libXdamage
|
||||
, libstartup_notification, libxfce4ui, libxfce4util, libwnck
|
||||
, libXpresent, xfconf }:
|
||||
|
||||
|
|
@ -13,7 +13,7 @@ mkXfceDerivation {
|
|||
|
||||
buildInputs = [
|
||||
dbus-glib
|
||||
epoxy
|
||||
libepoxy
|
||||
gtk3
|
||||
libXdamage
|
||||
libstartup_notification
|
||||
|
|
|
|||
|
|
@ -1,15 +1,14 @@
|
|||
{
|
||||
stdenv,
|
||||
clangStdenv,
|
||||
fetchgit,
|
||||
fetchpatch,
|
||||
libuuid,
|
||||
python3,
|
||||
bc,
|
||||
clang_9,
|
||||
llvmPackages_9,
|
||||
overrideCC,
|
||||
lib,
|
||||
{ stdenv
|
||||
, clangStdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, libuuid
|
||||
, python3
|
||||
, bc
|
||||
, clang_9
|
||||
, llvmPackages_9
|
||||
, overrideCC
|
||||
, lib
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -39,12 +38,26 @@ edk2 = buildStdenv.mkDerivation {
|
|||
version = "202108";
|
||||
|
||||
# submodules
|
||||
src = fetchgit {
|
||||
url = "https://github.com/tianocore/edk2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tianocore";
|
||||
repo = "edk2";
|
||||
rev = "edk2-stable${edk2.version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1ps244f7y43afxxw6z95xscy24f9mpp8g0mfn90rd4229f193ba2";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix for gcc-11 build.
|
||||
(fetchpatch {
|
||||
name = "gcc-11-vla.patch";
|
||||
url = "https://github.com/google/brotli/commit/0a3944c8c99b8d10cc4325f721b7c273d2b41f7b.patch";
|
||||
sha256 = "10c6ibnxh4f8lrh9i498nywgva32jxy2c1zzvr9mcqgblf9d19pj";
|
||||
# Apply submodule patch to subdirectory: "a/" -> "BaseTools/Source/C/BrotliCompress/brotli/"
|
||||
stripLen = 1;
|
||||
extraPrefix = "BaseTools/Source/C/BrotliCompress/brotli/";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ libuuid pythonEnv ];
|
||||
|
||||
makeFlags = [ "-C BaseTools" ]
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, ncurses
|
||||
, readline
|
||||
, withGui ? false
|
||||
, gtk3 ? null
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
, withTeensyduino ? false
|
||||
/* Packages needed for Teensyduino */
|
||||
|
|
@ -31,7 +31,6 @@
|
|||
, udev
|
||||
}:
|
||||
|
||||
assert withGui -> gtk3 != null && wrapGAppsHook != null;
|
||||
assert withTeensyduino -> withGui;
|
||||
let
|
||||
externalDownloads = import ./downloads.nix {
|
||||
|
|
@ -76,12 +75,12 @@ let
|
|||
else if stdenv.hostPlatform.isAarch32 then "linuxarm"
|
||||
else throw "${stdenv.hostPlatform.system} is not supported in teensy";
|
||||
|
||||
flavor = (if withTeensyduino then "teensyduino" else "arduino")
|
||||
pname = (if withTeensyduino then "teensyduino" else "arduino")
|
||||
+ lib.optionalString (!withGui) "-core";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "1.8.16";
|
||||
name = "${flavor}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arduino";
|
||||
|
|
@ -103,13 +102,12 @@ stdenv.mkDerivation rec {
|
|||
# Used because teensyduino requires jars be a specific size
|
||||
arduino_dist_src = fetchurl {
|
||||
url = "https://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz";
|
||||
sha256 =
|
||||
{
|
||||
linux64 = "sha256-VK+Skl2xjqPWYEEKt1CCLwBZRxoyRfYQ3/60Byen9po=";
|
||||
linux32 = "sha256-fjqV4avddmWAdFqMuUNUcDguxv3SI45m5QHFiWP8EKE=";
|
||||
linuxarm = "sha256-Br8vUN7njI7VCH+ZvUh44l8LcgW+61+Q0x2AiXxIhTM=";
|
||||
linuxaarch64 = "sha256-bOizBUUuyINg0/EqEatBq9lECT97JXxKbesCGyCA3YQ=";
|
||||
}.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}");
|
||||
sha256 = {
|
||||
linux64 = "sha256-VK+Skl2xjqPWYEEKt1CCLwBZRxoyRfYQ3/60Byen9po=";
|
||||
linux32 = "sha256-fjqV4avddmWAdFqMuUNUcDguxv3SI45m5QHFiWP8EKE=";
|
||||
linuxarm = "sha256-Br8vUN7njI7VCH+ZvUh44l8LcgW+61+Q0x2AiXxIhTM=";
|
||||
linuxaarch64 = "sha256-bOizBUUuyINg0/EqEatBq9lECT97JXxKbesCGyCA3YQ=";
|
||||
}.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}");
|
||||
};
|
||||
|
||||
# the glib setup hook will populate GSETTINGS_SCHEMAS_PATH,
|
||||
|
|
@ -157,7 +155,7 @@ stdenv.mkDerivation rec {
|
|||
javaPath = lib.makeBinPath [ jdk ];
|
||||
|
||||
# Everything else will be patched into rpath
|
||||
rpath = (lib.makeLibraryPath [ zlib libusb-compat-0_1 libusb1 readline ncurses5 stdenv.cc.cc ]);
|
||||
rpath = lib.makeLibraryPath [ zlib libusb-compat-0_1 libusb1 readline ncurses5 stdenv.cc.cc ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/arduino
|
||||
|
|
|
|||
|
|
@ -187,11 +187,6 @@ let
|
|||
# Fix linker error on Darwin (see https://trac.macports.org/ticket/61865)
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lobjc";
|
||||
|
||||
# Avoid Qt 5.12 problem on Big Sur: https://bugreports.qt.io/browse/QTBUG-87014
|
||||
qtWrapperArgs = lib.optionals stdenv.isDarwin [
|
||||
"--set QT_MAC_WANTS_LAYER 1"
|
||||
];
|
||||
|
||||
# See https://savannah.gnu.org/bugs/?50339
|
||||
F77_INTEGER_8_FLAG = if use64BitIdx then "-fdefault-integer-8" else "";
|
||||
|
||||
|
|
|
|||
|
|
@ -100,9 +100,22 @@ let
|
|||
|
||||
enableParallelBuilding = !crossCompiling;
|
||||
|
||||
# perl includes the build date, the uname of the build system and the
|
||||
# username of the build user in some files.
|
||||
# We override these to make it build deterministically.
|
||||
# other distro solutions
|
||||
# https://github.com/bmwiedemann/openSUSE/blob/master/packages/p/perl/perl-reproducible.patch
|
||||
# https://github.com/archlinux/svntogit-packages/blob/packages/perl/trunk/config.over
|
||||
# https://salsa.debian.org/perl-team/interpreter/perl/blob/debian-5.26/debian/config.over
|
||||
# A ticket has been opened upstream to possibly clean some of this up: https://rt.perl.org/Public/Bug/Display.html?id=133452
|
||||
preConfigure = ''
|
||||
substituteInPlace ./Configure --replace '`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1`' 'Thu Jan 1 00:00:01 UTC 1970'
|
||||
substituteInPlace ./Configure --replace '$uname -a' '$uname --kernel-name --machine --operating-system'
|
||||
cat > config.over <<EOF
|
||||
${lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) ''osvers="gnulinux"''}
|
||||
myuname="nixpkgs"
|
||||
myhostname="nixpkgs"
|
||||
cf_by="nixpkgs"
|
||||
cf_time="$(date -d "@$SOURCE_DATE_EPOCH")"
|
||||
EOF
|
||||
'' + optionalString stdenv.isDarwin ''
|
||||
substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
|
||||
'' + optionalString (!enableThreading) ''
|
||||
|
|
@ -110,6 +123,9 @@ let
|
|||
sed -i 's,\(libswanted.*\)pthread,\1,g' Configure
|
||||
'';
|
||||
|
||||
# Default perl does not support --host= & co.
|
||||
configurePlatforms = [];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
passthru = rec {
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spidermonkey";
|
||||
version = "78.11.0";
|
||||
version = "78.15.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
|
||||
sha256 = "0zjpzkxx3wc2840d7q4b9lnkj1kwk1qps29s9c83jf5y6xclnf9q";
|
||||
sha256 = "0l91cxdc5v9fps79ckb1kid4gw6v5qng1jd9zvaacwaiv628shx4";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,11 +1,23 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, imake, gccmakedep, bison, flex, pkg-config
|
||||
, xlibsWrapper, libXmu, libXpm, libXp }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, imake
|
||||
, gccmakedep
|
||||
, bison
|
||||
, flex
|
||||
, pkg-config
|
||||
, xlibsWrapper
|
||||
, libXmu
|
||||
, libXpm
|
||||
, libXp
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "Xaw3d";
|
||||
version = "1.6.3";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "Xaw3d-1.6.3";
|
||||
src = fetchurl {
|
||||
url = "https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2";
|
||||
url = "https://www.x.org/releases/individual/lib/libXaw3d-${version}.tar.bz2";
|
||||
sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid";
|
||||
};
|
||||
dontUseImakeConfigure = true;
|
||||
|
|
|
|||
|
|
@ -86,10 +86,6 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optional (!x11Support) "--without-x"
|
||||
++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ];
|
||||
|
||||
# Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11
|
||||
# (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands.
|
||||
# problems building without x11Support so disabled in that case for now
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
|
||||
NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -52,6 +52,10 @@ stdenv.mkDerivation rec {
|
|||
"-Dgtk_doc=${lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile.
|
||||
] ++ lib.optional isCross "-Dvapi=false";
|
||||
|
||||
checkInputs = [
|
||||
dbus # for dbus-daemon
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin;
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -16,10 +16,11 @@
|
|||
, libjpeg
|
||||
, libpng
|
||||
, gnome
|
||||
, gobject-introspection
|
||||
, doCheck ? false
|
||||
, makeWrapper
|
||||
, lib
|
||||
, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform)
|
||||
, gobject-introspection
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -43,13 +44,19 @@ stdenv.mkDerivation rec {
|
|||
./installed-tests-path.patch
|
||||
];
|
||||
|
||||
# gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work
|
||||
strictDeps = true;
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
python3
|
||||
gobject-introspection
|
||||
makeWrapper
|
||||
glib
|
||||
gi-docgen
|
||||
|
|
@ -58,7 +65,11 @@ stdenv.mkDerivation rec {
|
|||
libxslt
|
||||
docbook-xsl-nons
|
||||
docbook_xml_dtd_43
|
||||
] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
fixDarwinDylibNames
|
||||
] ++ lib.optionals withIntrospection [
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
|
|
@ -69,7 +80,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=${lib.boolToString withGtkDoc}"
|
||||
"-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}"
|
||||
"-Dintrospection=${if withIntrospection then "enabled" else "disabled"}"
|
||||
"-Dgio_sniffing=false"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,20 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, withShishi ? !stdenv.isDarwin, shishi ? null
|
||||
, withShishi ? !stdenv.isDarwin, shishi
|
||||
}:
|
||||
|
||||
assert withShishi -> shishi != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gss-1.0.3";
|
||||
pname = "gss";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gss/${name}.tar.gz";
|
||||
url = "mirror://gnu/gss/${pname}-${version}.tar.gz";
|
||||
sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional withShishi shishi;
|
||||
|
||||
configureFlags = [
|
||||
"--${if withShishi != null then "enable" else "disable"}-kereberos5"
|
||||
"--${if withShishi then "enable" else "disable"}-kerberos5"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, glib
|
||||
, gtk3
|
||||
, graphene
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, json-glib
|
||||
}:
|
||||
|
||||
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
epoxy
|
||||
libepoxy
|
||||
json-glib
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
, gobject-introspection
|
||||
, fribidi
|
||||
, xorg
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, libxkbcommon
|
||||
, libxml2
|
||||
, gmp
|
||||
|
|
@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
libxkbcommon
|
||||
epoxy
|
||||
libepoxy
|
||||
isocodes
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
, fribidi
|
||||
, harfbuzz
|
||||
, xorg
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, libxkbcommon
|
||||
, libxml2
|
||||
, gnome
|
||||
|
|
@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
libxkbcommon
|
||||
epoxy
|
||||
libepoxy
|
||||
isocodes
|
||||
] ++ lib.optionals vulkanSupport [
|
||||
vulkan-headers
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, libepoxy, gnome }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtkmm";
|
||||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja python3 ];
|
||||
buildInputs = [ epoxy ];
|
||||
buildInputs = [ libepoxy ];
|
||||
|
||||
propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
, glibmm_2_68
|
||||
, cairomm_1_16
|
||||
, pangomm_2_48
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, gnome
|
||||
, makeFontsConf
|
||||
, xvfb-run
|
||||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
epoxy
|
||||
libepoxy
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.8.2";
|
||||
version = "3.0.0";
|
||||
inherit (lib) optional optionals optionalString;
|
||||
mesonFeatureFlag = opt: b:
|
||||
"-D${opt}=${if b then "enabled" else "disabled"}";
|
||||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation {
|
|||
owner = "harfbuzz";
|
||||
repo = "harfbuzz";
|
||||
rev = version;
|
||||
sha256 = "sha256-uqcwfe5Oa3S0tyZDzqhIQfRFEv/HaiVWzVvwjqpLo5g=";
|
||||
sha256 = "sha256-yRRr4RcnbwoZ1Hn3+zbbocKFyBSLYx/exaAHNGsPINA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
|
|||
configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations")
|
||||
'';
|
||||
|
||||
# Disable parallel builds as manpages lack some dependencies:
|
||||
# ../tool/jhton ext/JudyHS_funcs_3.htm | grep -v '^[ ]*$' | sed -e 's/\.C//' > man/man3/JudyHS_funcs
|
||||
# make[2]: *** No rule to make target 'man/man3/JSLD', needed by 'all-am'. Stop.
|
||||
# Let's wait for the upstream fix similar to https://sourceforge.net/p/judy/patches/4/
|
||||
enableParallelBuilding = false;
|
||||
|
||||
meta = {
|
||||
homepage = "http://judy.sourceforge.net/";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
mkDerivation, extra-cmake-modules,
|
||||
epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage,
|
||||
libepoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage,
|
||||
kwidgetsaddons, kwindowsystem, qtdeclarative
|
||||
}:
|
||||
|
||||
|
|
@ -8,7 +8,7 @@ mkDerivation {
|
|||
name = "kdeclarative";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [
|
||||
epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons
|
||||
libepoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons
|
||||
kwindowsystem
|
||||
];
|
||||
propagatedBuildInputs = [ kconfig kpackage qtdeclarative ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, libcddb, pkg-config, ncurses, help2man, libiconv, Carbon, IOKit }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, libcddb, pkg-config, ncurses, help2man, libiconv, Carbon, IOKit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libcdio-2.1.0";
|
||||
|
|
@ -8,6 +8,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0avi6apv5ydjy6b9c3z9a46rvp5i57qyr09vr7x4nndxkmcfjl45";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# pull pending upstream patch to fix build on ncurses-6.3:
|
||||
# https://savannah.gnu.org/patch/index.php?10130
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://savannah.gnu.org/patch/download.php?file_id=52179";
|
||||
sha256 = "1v15gxhpi4bgcr12pb3d9c3hiwj0drvc832vic7sham34lhjmcbb";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue