ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-07 21:18:05 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2024-02-12 06:01:21 +00:00 committed by GitHub
commit 40b6ee19fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
21 changed files with 125 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -241,6 +241,12 @@
fingerprint = "DBF4 E6D0 90B8 BEA4 4BFE 1F1C 3442 4321 39B5 0691";
}];
};
_9R = {
email = "nix@9-r.net";
github = "9R";
githubId = 381298;
name = "9R";
};
a1russell = {
email = "adamlr6+pub@gmail.com";
github = "a1russell";

8
pkgs/applications/emulators/wine/base.nix
View File

@ -23,6 +23,8 @@ let
mingwGccsSuffixSalts = map (gcc: gcc.suffixSalt) mingwGccs;
};
} ./setup-hook-darwin.sh;
darwinUnsupportedFlags = [ "alsaSupport" "cairoSupport" "dbusSupport" "fontconfigSupport" "gtkSupport" "netapiSupport" "pulseaudioSupport" "udevSupport" "v4lSupport" "vaSupport" "waylandSupport" "x11Support" "xineramaSupport" ];
darwinUnsupported = builtins.any (name: builtins.getAttr name supportFlags) darwinUnsupportedFlags;
in
stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
builder = buildScript;
@ -47,7 +49,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
}) // rec {
inherit version src;
pname = prevName + lib.optionalString (wineRelease == "wayland") "-wayland";
pname = prevName + lib.optionalString (wineRelease != "stable" && wineRelease != "unstable") "-${wineRelease}";
# Fixes "Compiler cannot create executables" building wineWow with mingwSupport
strictDeps = true;
@ -209,8 +211,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
binaryNativeCode # mono, gecko
];
broken = stdenv.isDarwin && !supportFlags.mingwSupport;
description = if supportFlags.waylandSupport then "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)" else "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
platforms = if supportFlags.waylandSupport then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms;
description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
platforms = if darwinUnsupported then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms;
maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira reckenrode ];
inherit mainProgram;
};

6
pkgs/applications/emulators/wine/default.nix
View File

@ -35,9 +35,9 @@
vulkanSupport ? false,
sdlSupport ? false,
usbSupport ? false,
mingwSupport ? wineRelease != "stable",
waylandSupport ? stdenv.isLinux,
x11Support ? stdenv.isLinux,
mingwSupport ? false,
waylandSupport ? false,
x11Support ? false,
embedInstallers ? false, # The Mono and Gecko MSI installers
moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily
}:

19
pkgs/applications/emulators/wine/sources.nix
View File

@ -69,9 +69,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the hash for staging as well.
version = "9.0";
url = "https://dl.winehq.org/wine/source/9.0/wine-${version}.tar.xz";
hash = "sha256-fP0JClOV9bdtlbtd76yKMSyN5MBwwRY7i1jaODMMpu4=";
version = "9.2";
url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";
hash = "sha256-goHFoILMR6w8LJHOqt5fFzllU7Oa3LMudBJThltlgWI=";
inherit (stable) patches;
## see http://wiki.winehq.org/Gecko
@ -88,9 +88,9 @@ in rec {
## see http://wiki.winehq.org/Mono
mono = fetchurl rec {
version = "8.1.0";
version = "9.0.0";
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
hash = "sha256-DtPsUzrvebLzEhVZMc97EIAAmsDFtMK8/rZ4rJSOCBA=";
hash = "sha256-efbEMQBnVWbBEvQZm56nuUTTOBZLNL2R+hGwsKQU4cQ=";
};
updateScript = writeShellScript "update-wine-unstable" ''
@ -114,11 +114,12 @@ in rec {
'';
};
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
staging = fetchFromGitLab rec {
# https://gitlab.winehq.org/wine/wine-staging
inherit (unstable) version;
hash = "sha256-lE/95OZigifreaRRCPkvA+Z0FqsBmm018jD6leSysXU=";
owner = "wine-staging";
hash = "sha256-VQ4j4PuXRoXbCUZ16snVO+jRvuKD4Rjn14R7bhwdAco=";
domain = "gitlab.winehq.org";
owner = "wine";
repo = "wine-staging";
rev = "v${version}";

4
pkgs/applications/emulators/wine/staging.nix
View File

@ -7,12 +7,10 @@ let patch = (callPackage ./sources.nix {}).staging;
(mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra;
in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMinor patch.version;
(lib.overrideDerivation wineUnstable (self: {
(lib.overrideDerivation (wineUnstable.override { wineRelease = "staging"; }) (self: {
buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs;
nativeBuildInputs = [ autoconf hexdump perl python3 ] ++ self.nativeBuildInputs;
name = "${self.name}-staging";
prePatch = self.prePatch or "" + ''
patchShebangs tools
cp -r ${patch}/patches ${patch}/staging .

28
pkgs/applications/networking/flexget/default.nix
View File

@ -4,27 +4,9 @@
, fetchFromGitHub
}:
let
python = python3.override {
# FlexGet doesn't support transmission-rpc>=5 yet
# https://github.com/NixOS/nixpkgs/issues/258504
# https://github.com/Flexget/Flexget/issues/3847
packageOverrides = self: super: {
transmission-rpc = super.transmission-rpc.overridePythonAttrs (old: rec {
version = "4.3.1";
src = fetchPypi {
pname = "transmission_rpc";
inherit version;
hash = "sha256-Kh2eARIfM6MuXu7RjPPVhvPZ+bs0AXkA4qUCbfu5hHU=";
};
doCheck = false;
});
};
};
in
python.pkgs.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "flexget";
version = "3.11.8";
version = "3.11.17";
pyproject = true;
# Fetch from GitHub in order to use `requirements.in`
@ -32,7 +14,7 @@ python.pkgs.buildPythonApplication rec {
owner = "Flexget";
repo = "Flexget";
rev = "refs/tags/v${version}";
hash = "sha256-kJLcOk1ci4agSoBO7L1JacVq5G2jTjOj1mh7J8S2D+Y=";
hash = "sha256-C6BVSrF6xM3tnNnGS39T57N9jB5LnOq4W1hcF99CgPk=";
};
postPatch = ''
@ -40,12 +22,12 @@ python.pkgs.buildPythonApplication rec {
sed 's/[~<>=][^;]*//' -i requirements.txt
'';
nativeBuildInputs = with python.pkgs; [
nativeBuildInputs = with python3.pkgs; [
setuptools
wheel
];
propagatedBuildInputs = with python.pkgs; [
propagatedBuildInputs = with python3.pkgs; [
# See https://github.com/Flexget/Flexget/blob/master/requirements.txt
apscheduler
beautifulsoup4

6
pkgs/by-name/ir/ironbar/package.nix
View File

@ -21,16 +21,16 @@
rustPlatform.buildRustPackage rec {
pname = "ironbar";
version = "0.14.0";
version = "0.14.1";
src = fetchFromGitHub {
owner = "JakeStanger";
repo = "ironbar";
rev = "v${version}";
hash = "sha256-NRQAR412m14SHozYjJmlnb/TJyCroiWdqY0NLvCOQSE=";
hash = "sha256-y4w4i/IVe1+wjB2tsCPQH6c7XTl93u45Q0pXFi3TY1E=";
};
cargoHash = "sha256-EzLcmOppzUtTg1dOdZcx2rweiELPXv2Mt/we7hMr4m4=";
cargoHash = "sha256-h5yNJM+NvX/Hi86iSegHWevPcPZeDmJ4y/qNr3G20Qg=";
buildInputs = [
gtk3

6
pkgs/by-name/or/ory/package.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ory";
version = "0.3.2";
version = "0.3.4";
src = fetchFromGitHub {
owner = "ory";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-o5ii8+tQzVcoIgTHQ9nnGJf2VKhWhL+osbAKPB7esDA=";
hash = "sha256-q7+Fpttgx62GbKxCCiEDlX//e/pNO24e7KhhBeGRDH0=";
};
nativeBuildInputs = [
@ -23,7 +23,7 @@ buildGoModule rec {
"sqlite"
];
vendorHash = "sha256-iUPZbeCZ08iDf8+u2CoVH1yN2JyBqQjeS3dAKUMyX9Y=";
vendorHash = "sha256-B0y1JVjJmC5eitn7yIcDpl+9+xaBDJBMdvm+7N/ZxTk=";
postInstall = ''
mv $out/bin/cli $out/bin/ory

6
pkgs/by-name/pr/presenterm/package.nix
View File

@ -9,20 +9,20 @@
rustPlatform.buildRustPackage rec {
pname = "presenterm";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "mfontanini";
repo = "presenterm";
rev = "refs/tags/v${version}";
hash = "sha256-du/fL+6GYFm20jDdPwA/ImFI4HvhNTH2kVgToM0FETY=";
hash = "sha256-+XESFDseRScWYOry58JLknGv+xhewTKx38lrzQu2mQ4=";
};
buildInputs = [
libsixel
];
cargoHash = "sha256-zX6/1IRZVNjXtaJbQ/eUnGUOFvPTuKBHtVLpkfPr7XA=";
cargoHash = "sha256-xZLGm+tGAmmo/OzDMrgQK0uH7GMG6fTkpPsXwLe94VM=";
# Crashes at runtime on darwin with:
# Library not loaded: .../out/lib/libsixel.1.dylib

33
pkgs/by-name/si/sispmctl/package.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib
, stdenv
, fetchurl
, pkg-config
, libusb-compat-0_1
}:
stdenv.mkDerivation rec {
pname = "sispmctl";
version = "4.11";
src = fetchurl {
url = "mirror://sourceforge/sispmctl/sispmctl-${version}.tar.gz";
hash = "sha256-dLlKNxAEaxUHDHMR8MrLgVVMhrQidxnMJzPLlscFJXg=";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
libusb-compat-0_1
];
meta = with lib; {
homepage = "https://sispmctl.sourceforge.net/";
description = "USB controlled powerstrips management software";
license = licenses.gpl2Plus;
mainProgram = "sispmctl";
maintainers = [ maintainers._9R ];
platforms = platforms.unix;
};
}

4
pkgs/desktops/budgie/budgie-backgrounds/default.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "budgie-backgrounds";
version = "2.0";
version = "3.0";
src = fetchFromGitHub {
owner = "BuddiesOfBudgie";
repo = "budgie-backgrounds";
rev = "v${version}";
hash = "sha256-L6y9YVS0NFsycS90AmUJJd9HFMJ/Ge99pI426tC05jA=";
hash = "sha256-2E6+WDLIAwqiiPMJw+tLDCT3CnpboH4X0cB87zw/hBQ=";
};
nativeBuildInputs = [

17
pkgs/development/compilers/yosys/default.nix
View File

@ -77,13 +77,13 @@ let
in stdenv.mkDerivation (finalAttrs: {
pname = "yosys";
version = "0.37";
version = "0.38";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
rev = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}";
hash = "sha256-JRztXMZMBFhdZMeVHkRxFulRrFzyuNaLzcRlmgAz6Gc=";
hash = "sha256-mzMBhnIEgToez6mGFOvO7zBA+rNivZ9OnLQsjBBDamA=";
};
enableParallelBuilding = true;
@ -107,7 +107,11 @@ in stdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace ./Makefile \
--replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 finalAttrs.src.rev}'
--replace-fail 'echo UNKNOWN' 'echo ${builtins.substring 0 10 finalAttrs.src.rev}'
# https://github.com/YosysHQ/yosys/pull/4199
substituteInPlace ./tests/various/clk2fflogic_effects.sh \
--replace-fail 'tail +3' 'tail -n +3'
chmod +x ./misc/yosys-config.in
patchShebangs tests ./misc/yosys-config.in
@ -135,6 +139,13 @@ in stdenv.mkDerivation (finalAttrs: {
echo "BOOST_PYTHON_LIB := -lboost_python${lib.versions.major python3.version}${lib.versions.minor python3.version}" >> Makefile.conf
'';
preCheck = ''
# autotest.sh automatically compiles a utility during startup if it's out of date.
# having N check jobs race to do that creates spurious codesigning failures on macOS.
# run it once without asking it to do anything so that compilation is done before the jobs start.
tests/tools/autotest.sh
'';
checkTarget = "test";
doCheck = true;
nativeCheckInputs = [ verilog ];

4
pkgs/development/python-modules/apycula/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "apycula";
version = "0.10.0";
version = "0.11.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "Apycula";
hash = "sha256-nSj+c6IX57kwcDz/h2Sg4U8JlxZ5fq8k7hDL1zCE08g=";
hash = "sha256-yuDyW1JXavI6U3B3hx3kdHBuVCQd2rJJqgZ0z15ahaw=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/pytest-describe/default.nix
View File

@ -11,7 +11,7 @@
let
pname = "pytest-describe";
version = "2.1.0";
version = "2.2.0";
in
buildPythonPackage {
inherit pname version;
@ -19,7 +19,7 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
hash = "sha256-BjDJWsSUKrjc2OdmI2+GQ2tJhIltsMBZ/CNP72b+lzI=";
hash = "sha256-ObsF65DySX2co0Lvmgt/pbraflhQWuwz9m1mHWMZVbc=";
};
buildInputs = [

6
pkgs/development/ruby-modules/gem-config/default.nix
View File

@ -21,7 +21,7 @@
, libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick, lasem
, pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi
, cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, pcre2, gecode_3, curl
, msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, gtk3, buildRubyGem
, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, gtk3, buildRubyGem
, cairo, expat, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk
@ -570,10 +570,6 @@ in
'';
};
msgpack = attrs: {
buildInputs = [ msgpack ];
};
mysql = attrs: {
buildInputs = [ libmysqlclient zlib openssl ];
};

4
pkgs/development/tools/symfony-cli/default.nix
View File

@ -10,14 +10,14 @@
buildGoModule rec {
pname = "symfony-cli";
version = "5.8.6";
version = "5.8.8";
vendorHash = "sha256-ACK0JCaS1MOCgUi2DMEjIcKf/nMCcrdDyIdioBZv7qw=";
src = fetchFromGitHub {
owner = "symfony-cli";
repo = "symfony-cli";
rev = "v${version}";
hash = "sha256-lZ4jPmqPGyWp8xS156XXl6s4ZfNbU4M5xJy25nRL1Bs=";
hash = "sha256-GdmFRGyp4s5G5RTEFKjcrY/OpaEVCgRhNVJbY1F8vk0=";
};
ldflags = [

4
pkgs/os-specific/darwin/sketchybar/default.nix
View File

@ -22,13 +22,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "sketchybar";
version = "2.20.0";
version = "2.20.1";
src = fetchFromGitHub {
owner = "FelixKratz";
repo = "SketchyBar";
rev = "v${finalAttrs.version}";
hash = "sha256-Nyje2F2OXtojbAGNgGPGdX8SEH75SWWpBKLFULb96n4=";
hash = "sha256-dyo4J3Qszq7SSXdAXmgm7xFhWE5Eqtr7yZpNGmtuphY=";
};
buildInputs = [

6
pkgs/os-specific/darwin/yabai/default.nix
View File

@ -17,7 +17,7 @@
let
pname = "yabai";
version = "6.0.7";
version = "6.0.11";
test-version = testers.testVersion {
package = yabai;
@ -53,7 +53,7 @@ in
src = fetchzip {
url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz";
hash = "sha256-hZMBXSCiTlx/37jt2yLquCQ8AZ2LS3heIFPKolLub1c=";
hash = "sha256-CfyuWvxkeZQVuwMbX90CZF0RiY6q+o0WtfE3H9Z8q1o=";
};
nativeBuildInputs = [
@ -89,7 +89,7 @@ in
owner = "koekeishiya";
repo = "yabai";
rev = "v${version}";
hash = "sha256-vWL2KA+Rhj78I2J1kGItJK+OdvhVo1ts0NoOHIK65Hg=";
hash = "sha256-HaflgZJ7QqooaSUNW+Uu0LD9+AVu4hHyJtILUrOC9+I=";
};
nativeBuildInputs = [

49
pkgs/os-specific/linux/sysdig/default.nix
View File

@ -4,11 +4,11 @@
}:
let
# Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake
libsRev = "0.13.1";
libsHash = "sha256-UNoXIkFr64Nr0XVAtV4+BMNpCk4w8Dn4waZek/ok4Uk=";
# Compare with https://github.com/draios/sysdig/blob/0.35.1/cmake/modules/falcosecurity-libs.cmake
libsRev = "0.14.2";
libsHash = "sha256-sWrniRB/vQd1BZnsiz+wLHugrF3LhuAr9e9gDMavLoo=";
# Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17
# Compare with https://github.com/falcosecurity/libs/blob/0.14.2/cmake/modules/valijson.cmake
valijson = fetchFromGitHub {
owner = "tristanpenman";
repo = "valijson";
@ -16,42 +16,23 @@ let
hash = "sha256-ZD19Q2MxMQd3yEKbY90GFCrerie5/jzgO8do4JQDoKM=";
};
tinydir = fetchFromGitHub {
owner = "cxong";
repo = "tinydir";
rev = "1.2.5";
hash = "sha256-qQhvLzpCYMAafBNRWlY5yklHrILM8BYD+xxF0l17+do=";
};
# https://github.com/draios/sysdig/blob/0.31.5/cmake/modules/driver.cmake
# https://github.com/draios/sysdig/blob/0.35.1/cmake/modules/driver.cmake
driver = fetchFromGitHub {
owner = "falcosecurity";
repo = "libs";
rev = "6.0.1+driver";
hash = "sha256-e9TJl/IahrUc4Yq2/KssTz3IBjOZwXeLt1jOkZ94EiE=";
};
# can be dropped in next release
uthashDevendorPatch = fetchpatch {
url = "https://github.com/falcosecurity/libs/commit/0d58f798ab72e21a16ee6965c775cba2932e5100.patch";
hash = "sha256-5Y79M9u5rXZiKllJcXzDDw/3JKt0k/CgvWx+MZepkpw=";
};
# https://github.com/falcosecurity/libs/blob/master/cmake/modules/b64.cmake
base64 = fetchurl {
url = "https://raw.githubusercontent.com/istio/proxy/1.18.2/extensions/common/wasm/base64.h";
hash = "sha256-WvHRHp5caMBDvH+2pMrU4ZptX6WvPcPaeVGtVBBCw64=";
rev = "7.0.0+driver";
hash = "sha256-kXqvfM7HbGh2wEGaO4KBkFDW+m5gpOShJZKJLu9McKk=";
};
in
stdenv.mkDerivation rec {
pname = "sysdig";
version = "0.34.1";
version = "0.35.1";
src = fetchFromGitHub {
owner = "draios";
repo = "sysdig";
rev = version;
hash = "sha256-G1yr1wHiaGvLMtBZgh4eoiRNJiH0cghHqWFOjKYXXsw=";
hash = "sha256-nSCkKwhdEduepyvcyWEKMQtQ6TfhF3GnTSreRVoarsw=";
};
nativeBuildInputs = [ cmake perl installShellFiles pkg-config ];
@ -84,15 +65,13 @@ stdenv.mkDerivation rec {
hash = libsHash;
}} libs
chmod -R +w libs
pushd libs
patch -p1 < ${uthashDevendorPatch}
popd
substituteInPlace libs/userspace/libscap/libscap.pc.in libs/userspace/libsinsp/libsinsp.pc.in \
--replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@" \
--replace-fail "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "@CMAKE_INSTALL_FULL_INCLUDEDIR@"
cp -r ${driver} driver-src
chmod -R +w driver-src
pushd driver-src
patch -p1 < ${uthashDevendorPatch}
popd
cmakeFlagsArray+=(
"-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs"
"-DDRIVER_SOURCE_DIR=$(pwd)/driver-src/driver"
@ -108,7 +87,6 @@ stdenv.mkDerivation rec {
"-DUSE_BUNDLED_JSONCPP=OFF"
"-DCREATE_TEST_TARGETS=OFF"
"-DVALIJSON_INCLUDE=${valijson}/include"
"-DTINYDIR_INCLUDE=${tinydir}"
"-DUTHASH_INCLUDE=${uthash}/include"
] ++ lib.optional (kernel == null) "-DBUILD_DRIVER=OFF";
@ -124,7 +102,6 @@ stdenv.mkDerivation rec {
exit 1
fi
cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -lzstd -labsl_synchronization")
install -D ${base64} build/b64/base64.h
'' + lib.optionalString (kernel != null) ''
export INSTALL_MOD_PATH="$out"
export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

8
pkgs/tools/archivers/arc_unpacker/default.nix
View File

@ -31,6 +31,11 @@ stdenv.mkDerivation {
url = "https://aur.archlinux.org/cgit/aur.git/plain/failing_tests.patch?h=arc_unpacker-git&id=bda1ad9f69e6802e703b2e6913d71a36d76cfef9";
hash = "sha256-bClACsf/+SktyLAPtt7EcSqprkw8JVIi1ZLpcJcv9IE=";
})
(fetchpatch {
name = "include_cstdint.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/include_cstdint.patch?h=arc_unpacker-git&id=8c5c5121b23813c7650db19cb617b409d8fdcc9f";
hash = "sha256-3BQ1v7s9enUK/js7Jqrqo2RdSRvGVd7hMcY4iL51SiE=";
})
];
postPatch = ''
@ -86,5 +91,8 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ midchildan ];
platforms = platforms.all;
mainProgram = "arc_unpacker";
# unit test failures
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

6
pkgs/top-level/wine-packages.nix
View File

@ -25,6 +25,8 @@ rec {
sdlSupport = true;
mingwSupport = true;
usbSupport = true;
waylandSupport = stdenv.isLinux;
x11Support = stdenv.isLinux;
};
full = base.override {
@ -50,6 +52,6 @@ rec {
staging = base.override { wineRelease = "staging"; };
stagingFull = full.override { wineRelease = "staging"; };
wayland = base.override { wineRelease = "wayland"; };
waylandFull = full.override { wineRelease = "wayland"; };
wayland = base.override { wineRelease = "wayland"; waylandSupport = true; };
waylandFull = full.override { wineRelease = "wayland"; waylandSupport = true; };
}