Merge #219444: staging-next 2023-03-04
This commit is contained in:
Vladimír Čunát
commit
a86610144f
|
|
@ -116,10 +116,6 @@ For convenience, it also adds `dconf.lib` for a GIO module implementing a GSetti
|
|||
|
||||
- []{#ssec-gnome-hooks-gobject-introspection} `gobject-introspection` setup hook populates `GI_TYPELIB_PATH` variable with `lib/girepository-1.0` directories of dependencies, which is then added to wrapper by `wrapGAppsHook`. It also adds `share` directories of dependencies to `XDG_DATA_DIRS`, which is intended to promote GIR files but it also [pollutes the closures](https://github.com/NixOS/nixpkgs/issues/32790) of packages using `wrapGAppsHook`.
|
||||
|
||||
::: {.warning}
|
||||
The setup hook [currently](https://github.com/NixOS/nixpkgs/issues/56943) does not work in expressions with `strictDeps` enabled, like Python packages. In those cases, you will need to disable it with `strictDeps = false;`.
|
||||
:::
|
||||
|
||||
- []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGAppsHook`.
|
||||
|
||||
You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs` in `preFixup` hook:
|
||||
|
|
|
|||
|
|
@ -158,6 +158,16 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
managerEnvironment = mkOption {
|
||||
type = with types; attrsOf (nullOr (oneOf [ str path package ]));
|
||||
default = {};
|
||||
example = { SYSTEMD_LOG_LEVEL = "debug"; };
|
||||
description = lib.mdDoc ''
|
||||
Environment variables of PID 1. These variables are
|
||||
*not* passed to started units.
|
||||
'';
|
||||
};
|
||||
|
||||
contents = mkOption {
|
||||
description = lib.mdDoc "Set of files that have to be linked into the initrd";
|
||||
example = literalExpression ''
|
||||
|
|
@ -355,8 +365,11 @@ in {
|
|||
less = "${pkgs.less}/bin/less";
|
||||
mount = "${cfg.package.util-linux}/bin/mount";
|
||||
umount = "${cfg.package.util-linux}/bin/umount";
|
||||
fsck = "${cfg.package.util-linux}/bin/fsck";
|
||||
};
|
||||
|
||||
managerEnvironment.PATH = "/bin:/sbin";
|
||||
|
||||
contents = {
|
||||
"/init".source = "${cfg.package}/lib/systemd/systemd";
|
||||
"/etc/systemd/system".source = stage1Units;
|
||||
|
|
@ -365,6 +378,7 @@ in {
|
|||
[Manager]
|
||||
DefaultEnvironment=PATH=/bin:/sbin ${optionalString (isBool cfg.emergencyAccess && cfg.emergencyAccess) "SYSTEMD_SULOGIN_FORCE=1"}
|
||||
${cfg.extraConfig}
|
||||
ManagerEnvironment=${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment)}
|
||||
'';
|
||||
|
||||
"/lib/modules".source = "${modulesClosure}/lib/modules";
|
||||
|
|
@ -444,21 +458,6 @@ in {
|
|||
(v: let n = escapeSystemdPath v.where;
|
||||
in nameValuePair "${n}.automount" (automountToUnit n v)) cfg.automounts);
|
||||
|
||||
# The unit in /run/systemd/generator shadows the unit in
|
||||
# /etc/systemd/system, but will still apply drop-ins from
|
||||
# /etc/systemd/system/foo.service.d/
|
||||
#
|
||||
# We need IgnoreOnIsolate, otherwise the Requires dependency of
|
||||
# a mount unit on its makefs unit causes it to be unmounted when
|
||||
# we isolate for switch-root. Use a dummy package so that
|
||||
# generateUnits will generate drop-ins instead of unit files.
|
||||
packages = [(pkgs.runCommand "dummy" {} ''
|
||||
mkdir -p $out/etc/systemd/system
|
||||
touch $out/etc/systemd/system/systemd-{makefs,growfs}@.service
|
||||
'')];
|
||||
services."systemd-makefs@" = lib.mkIf needMakefs { unitConfig.IgnoreOnIsolate = true; };
|
||||
services."systemd-growfs@" = lib.mkIf needGrowfs { unitConfig.IgnoreOnIsolate = true; };
|
||||
|
||||
# make sure all the /dev nodes are set up
|
||||
services.systemd-tmpfiles-setup-dev.wantedBy = ["sysinit.target"];
|
||||
|
||||
|
|
|
|||
|
|
@ -140,7 +140,10 @@ let
|
|||
else if config.fsType == "reiserfs" then "-q"
|
||||
else null;
|
||||
in {
|
||||
options = mkIf config.autoResize [ "x-nixos.autoresize" ];
|
||||
options = mkMerge [
|
||||
(mkIf config.autoResize [ "x-nixos.autoresize" ])
|
||||
(mkIf (utils.fsNeededForBoot config) [ "x-initrd.mount" ])
|
||||
];
|
||||
formatOptions = mkIf (defaultFormatOptions != null) (mkDefault defaultFormatOptions);
|
||||
};
|
||||
|
||||
|
|
@ -155,27 +158,54 @@ let
|
|||
|
||||
makeFstabEntries =
|
||||
let
|
||||
fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "nfs4" "vboxsf" "glusterfs" "apfs" "9p" "cifs" "prl_fs" "vmhgfs" ];
|
||||
fsToSkipCheck = [
|
||||
"none"
|
||||
"auto"
|
||||
"overlay"
|
||||
"iso9660"
|
||||
"bindfs"
|
||||
"udf"
|
||||
"btrfs"
|
||||
"zfs"
|
||||
"tmpfs"
|
||||
"bcachefs"
|
||||
"nfs"
|
||||
"nfs4"
|
||||
"nilfs2"
|
||||
"vboxsf"
|
||||
"squashfs"
|
||||
"glusterfs"
|
||||
"apfs"
|
||||
"9p"
|
||||
"cifs"
|
||||
"prl_fs"
|
||||
"vmhgfs"
|
||||
] ++ lib.optionals (!config.boot.initrd.checkJournalingFS) [
|
||||
"ext3"
|
||||
"ext4"
|
||||
"reiserfs"
|
||||
"xfs"
|
||||
"jfs"
|
||||
"f2fs"
|
||||
];
|
||||
isBindMount = fs: builtins.elem "bind" fs.options;
|
||||
skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck || isBindMount fs;
|
||||
# https://wiki.archlinux.org/index.php/fstab#Filepath_spaces
|
||||
escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string;
|
||||
in fstabFileSystems: { rootPrefix ? "", excludeChecks ? false, extraOpts ? (fs: []) }: concatMapStrings (fs:
|
||||
in fstabFileSystems: { rootPrefix ? "", extraOpts ? (fs: []) }: concatMapStrings (fs:
|
||||
(optionalString (isBindMount fs) (escape rootPrefix))
|
||||
+ (if fs.device != null then escape fs.device
|
||||
else if fs.label != null then "/dev/disk/by-label/${escape fs.label}"
|
||||
else throw "No device specified for mount point ‘${fs.mountPoint}’.")
|
||||
+ " " + escape (rootPrefix + fs.mountPoint)
|
||||
+ " " + escape fs.mountPoint
|
||||
+ " " + fs.fsType
|
||||
+ " " + escape (builtins.concatStringsSep "," (fs.options ++ (extraOpts fs)))
|
||||
+ " " + (optionalString (!excludeChecks)
|
||||
("0 " + (if skipCheck fs then "0" else if fs.mountPoint == "/" then "1" else "2")))
|
||||
+ " 0 " + (if skipCheck fs then "0" else if fs.mountPoint == "/" then "1" else "2")
|
||||
+ "\n"
|
||||
) fstabFileSystems;
|
||||
|
||||
initrdFstab = pkgs.writeText "initrd-fstab" (makeFstabEntries (filter utils.fsNeededForBoot fileSystems) {
|
||||
rootPrefix = "/sysroot";
|
||||
excludeChecks = true;
|
||||
extraOpts = fs:
|
||||
(optional fs.autoResize "x-systemd.growfs")
|
||||
++ (optional fs.autoFormat "x-systemd.makefs");
|
||||
|
|
@ -328,7 +358,9 @@ in
|
|||
)}
|
||||
'';
|
||||
|
||||
boot.initrd.systemd.contents."/etc/fstab".source = initrdFstab;
|
||||
boot.initrd.systemd.storePaths = [initrdFstab];
|
||||
boot.initrd.systemd.managerEnvironment.SYSTEMD_SYSROOT_FSTAB = initrdFstab;
|
||||
boot.initrd.systemd.services.initrd-parse-etc.environment.SYSTEMD_SYSROOT_FSTAB = initrdFstab;
|
||||
|
||||
# Provide a target that pulls in all filesystems.
|
||||
systemd.targets.fs =
|
||||
|
|
|
|||
|
|
@ -1101,15 +1101,17 @@ in
|
|||
what = "overlay";
|
||||
type = "overlay";
|
||||
options = "lowerdir=/sysroot/nix/.ro-store,upperdir=/sysroot/nix/.rw-store/store,workdir=/sysroot/nix/.rw-store/work";
|
||||
wantedBy = ["local-fs.target"];
|
||||
before = ["local-fs.target"];
|
||||
requires = ["sysroot-nix-.ro\\x2dstore.mount" "sysroot-nix-.rw\\x2dstore.mount" "rw-store.service"];
|
||||
after = ["sysroot-nix-.ro\\x2dstore.mount" "sysroot-nix-.rw\\x2dstore.mount" "rw-store.service"];
|
||||
unitConfig.IgnoreOnIsolate = true;
|
||||
wantedBy = ["initrd-fs.target"];
|
||||
before = ["initrd-fs.target"];
|
||||
requires = ["rw-store.service"];
|
||||
after = ["rw-store.service"];
|
||||
unitConfig.RequiresMountsFor = "/sysroot/nix/.ro-store";
|
||||
}];
|
||||
services.rw-store = {
|
||||
after = ["sysroot-nix-.rw\\x2dstore.mount"];
|
||||
unitConfig.DefaultDependencies = false;
|
||||
unitConfig = {
|
||||
DefaultDependencies = false;
|
||||
RequiresMountsFor = "/sysroot/nix/.rw-store";
|
||||
};
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStart = "/bin/mkdir -p -m 0755 /sysroot/nix/.rw-store/store /sysroot/nix/.rw-store/work /sysroot/nix/store";
|
||||
|
|
|
|||
|
|
@ -238,6 +238,7 @@ in {
|
|||
freshrss-pgsql = handleTest ./freshrss-pgsql.nix {};
|
||||
frr = handleTest ./frr.nix {};
|
||||
fsck = handleTest ./fsck.nix {};
|
||||
fsck-systemd-stage-1 = handleTest ./fsck.nix { systemdStage1 = true; };
|
||||
ft2-clone = handleTest ./ft2-clone.nix {};
|
||||
mimir = handleTest ./mimir.nix {};
|
||||
garage = handleTest ./garage {};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
{ system ? builtins.currentSystem
|
||||
, config ? {}
|
||||
, pkgs ? import ../.. { inherit system config; }
|
||||
, systemdStage1 ? false
|
||||
}:
|
||||
|
||||
import ./make-test-python.nix {
|
||||
name = "fsck";
|
||||
|
||||
|
|
@ -11,13 +17,17 @@ import ./make-test-python.nix {
|
|||
autoFormat = true;
|
||||
};
|
||||
};
|
||||
|
||||
boot.initrd.systemd.enable = systemdStage1;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("default.target")
|
||||
|
||||
with subtest("root fs is fsckd"):
|
||||
machine.succeed("journalctl -b | grep 'fsck.ext4.*/dev/vda'")
|
||||
machine.succeed("journalctl -b | grep '${if systemdStage1
|
||||
then "fsck.*vda.*clean"
|
||||
else "fsck.ext4.*/dev/vda"}'")
|
||||
|
||||
with subtest("mnt fs is fsckd"):
|
||||
machine.succeed("journalctl -b | grep 'fsck.*/dev/vdb.*clean'")
|
||||
|
|
|
|||
|
|
@ -107,7 +107,10 @@ import ../make-test-python.nix (
|
|||
client = { pkgs, ... }: {
|
||||
environment.systemPackages = [
|
||||
(pkgs.writers.writePython3Bin "create_management_room_and_invite_mjolnir"
|
||||
{ libraries = [ pkgs.python3Packages.matrix-nio ]; } ''
|
||||
{ libraries = with pkgs.python3Packages; [
|
||||
matrix-nio
|
||||
] ++ matrix-nio.optional-dependencies.e2e;
|
||||
} ''
|
||||
import asyncio
|
||||
|
||||
from nio import (
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ in {
|
|||
};
|
||||
};
|
||||
testScript = { nodes, ... }: let
|
||||
specializations = "${nodes.machine.config.system.build.toplevel}/specialisation";
|
||||
specializations = "${nodes.machine.system.build.toplevel}/specialisation";
|
||||
changeRootPw = ''
|
||||
dn: olcDatabase={1}mdb,cn=config
|
||||
changetype: modify
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@ python3Packages.buildPythonApplication rec {
|
|||
pkg-config
|
||||
wrapGAppsHook4
|
||||
desktop-file-utils
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk4
|
||||
libadwaita
|
||||
gobject-introspection
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
|
|
@ -48,9 +48,6 @@ python3Packages.buildPythonApplication rec {
|
|||
pygobject3
|
||||
];
|
||||
|
||||
# Broken with gobject-introspection setup hook
|
||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
format = "other";
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -24,11 +24,6 @@ python3Packages.buildPythonApplication rec {
|
|||
pname = "cozy";
|
||||
version = "1.2.1";
|
||||
|
||||
# Temporary fix
|
||||
# See https://github.com/NixOS/nixpkgs/issues/57029
|
||||
# and https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geigi";
|
||||
repo = pname;
|
||||
|
|
|
|||
|
|
@ -107,6 +107,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
badPlatforms = [ "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,17 +27,12 @@ python3Packages.buildPythonApplication rec {
|
|||
intltool
|
||||
wrapGAppsHook
|
||||
glibcLocales
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
# as of 2021-07, the gobject-introspection setup hook does not
|
||||
# work with `strictDeps` enabled, thus for proper `wrapGAppsHook`
|
||||
# it needs to be disabled explicitly. https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
buildInputs = [
|
||||
python3
|
||||
gtk3
|
||||
gobject-introspection
|
||||
gnome.adwaita-icon-theme
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ python3Packages.buildPythonApplication {
|
|||
notify2
|
||||
pyroute2
|
||||
pygobject3
|
||||
PyChromecast
|
||||
pychromecast
|
||||
lxml
|
||||
setuptools
|
||||
zeroconf
|
||||
|
|
|
|||
|
|
@ -110,6 +110,5 @@ in stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
badPlatforms = [ "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,10 +39,6 @@ in buildPythonApplication rec {
|
|||
setuptools
|
||||
];
|
||||
|
||||
# Otherwise the setup hook for gobject-introspection is not run:
|
||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
postPatch = ''
|
||||
# Remove "Local MPD" tab which is not suitable for NixOS.
|
||||
sed -i '/localmpd/d' sonata/consts.py
|
||||
|
|
|
|||
|
|
@ -70,15 +70,11 @@ python3Packages.buildPythonApplication rec {
|
|||
requests
|
||||
semver
|
||||
]
|
||||
++ lib.optional chromecastSupport PyChromecast
|
||||
++ lib.optional chromecastSupport pychromecast
|
||||
++ lib.optional keyringSupport keyring
|
||||
++ lib.optional serverSupport bottle
|
||||
;
|
||||
|
||||
# hook for gobject-introspection doesn't like strictDeps
|
||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytest
|
||||
];
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
|
|||
plexapi
|
||||
pulsectl
|
||||
pycairo
|
||||
PyChromecast
|
||||
pychromecast
|
||||
pylast
|
||||
pygobject3
|
||||
pylyrics
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
, zlib
|
||||
}:
|
||||
let
|
||||
py3 = python3.withPackages (p: [ p.Mako ]);
|
||||
py3 = python3.withPackages (p: [ p.mako ]);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clightning";
|
||||
|
|
|
|||
|
|
@ -66,6 +66,5 @@ stdenv.mkDerivation rec {
|
|||
maintainers = [ maintainers.mkg20001 ];
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
badPlatforms = [ "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,10 +30,6 @@ buildPythonApplication rec {
|
|||
"--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
|
||||
];
|
||||
|
||||
# Until gobject-introspection in nativeBuildInputs is supported.
|
||||
# https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-472568643
|
||||
strictDeps = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://rednotebook.sourceforge.io/";
|
||||
changelog = "https://github.com/jendrikseipp/rednotebook/blob/v${version}/CHANGELOG.md";
|
||||
|
|
|
|||
|
|
@ -135,9 +135,6 @@ stdenv.mkDerivation rec {
|
|||
"--set QT_QPA_PLATFORM xcb"
|
||||
];
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
|
||||
|
||||
# Use nix-provided libraries instead of submodules
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
|
|
|
|||
|
|
@ -57,6 +57,5 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ lassulus netali ];
|
||||
homepage = "https://vba-m.com/";
|
||||
platforms = lib.platforms.linux;
|
||||
badPlatforms = [ "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ in python.pkgs.buildPythonApplication rec {
|
|||
vobject
|
||||
werkzeug
|
||||
xlrd
|
||||
XlsxWriter
|
||||
xlsxwriter
|
||||
xlwt
|
||||
zeep
|
||||
];
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
cadquery
|
||||
Logbook
|
||||
logbook
|
||||
pyqt5
|
||||
pyparsing
|
||||
pyqtgraph
|
||||
|
|
|
|||
|
|
@ -37,24 +37,30 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
appstream-glib
|
||||
gettext
|
||||
gtk3
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
appstream-glib
|
||||
python3.pkgs.pygobject3
|
||||
gobject-introspection
|
||||
gettext
|
||||
];
|
||||
|
||||
# Currently still required for the gobject-introspection setup hook
|
||||
strictDeps = false;
|
||||
|
||||
preInstall = ''
|
||||
patchShebangs ../build-aux/meson/postinstall.py
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/curtail --prefix PATH : ${lib.makeBinPath [ jpegoptim libwebp optipng pngquant ]}
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
"--prefix" "PATH" ":" "${lib.makeBinPath [ jpegoptim libwebp optipng pngquant ]}"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
wxPython_4_2
|
||||
dbus-python
|
||||
distro
|
||||
PyChromecast
|
||||
pychromecast
|
||||
send2trash
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
|
|||
wrapQtAppsHook
|
||||
python3Packages.setuptools
|
||||
python3Packages.rfc3987
|
||||
python3Packages.JPype1
|
||||
python3Packages.jpype1
|
||||
python3Packages.pyqt5
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -25,17 +25,13 @@ python3.pkgs.buildPythonApplication rec {
|
|||
hash = "sha256-Nok4oqTezO84q9IDZvgi33ZeKfRL+tpg7QEDmp2ZZpU=";
|
||||
};
|
||||
|
||||
buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ];
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
buildInputs = [ gtk3 gdk-pixbuf ];
|
||||
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
|
||||
propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]);
|
||||
|
||||
# Tests are broken
|
||||
doCheck = false;
|
||||
|
||||
# Correct wrapper behavior, see https://github.com/NixOS/nixpkgs/issues/56943
|
||||
# until https://github.com/NixOS/nixpkgs/pull/102613
|
||||
strictDeps = false;
|
||||
|
||||
# prevent double wrapping
|
||||
dontWrapGApps = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -37,10 +37,6 @@ buildPythonPackage rec {
|
|||
gtk3
|
||||
];
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
||||
# this must be false, otherwise the gobject-introspection hook doesn't run
|
||||
strictDeps = false;
|
||||
|
||||
preDistPhases = [ "fixupIconPath" ];
|
||||
|
||||
fixupIconPath = ''
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
|
|||
changelog = "https://github.com/Tom94/tev/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
badPlatforms = [ "aarch64-linux" ]; # fails on Hydra since forever
|
||||
broken = stdenv.isDarwin; # needs apple frameworks + SDK fix? see #205247
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -99,11 +99,11 @@ stdenv.mkDerivation rec {
|
|||
setupPyBuildFlags = [ "--enable=load_extension" ];
|
||||
}))
|
||||
beautifulsoup4
|
||||
cchardet
|
||||
css-parser
|
||||
cssselect
|
||||
python-dateutil
|
||||
dnspython
|
||||
faust-cchardet
|
||||
feedparser
|
||||
html2text
|
||||
html5-parser
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
, pango
|
||||
, gst-python
|
||||
, kiss-headers
|
||||
, Logbook
|
||||
, logbook
|
||||
, pillow
|
||||
, poetry-core
|
||||
, pygobject3
|
||||
|
|
@ -47,7 +47,7 @@ buildPythonApplication rec {
|
|||
propagatedBuildInputs = [
|
||||
gst-python
|
||||
kiss-headers
|
||||
Logbook
|
||||
logbook
|
||||
pillow
|
||||
poetry-core
|
||||
pygobject3
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
name = "cotp";
|
||||
pname = "cotp";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
|
|||
hash = "sha256-Pg07iq2jj8cUA4iQsY52cujmUZLYrbTG5Zj+lITxpls=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gH9axiM0Qgl2TdJUpnDONHtU2I5l03SrKEe+2l5V21Y=";
|
||||
cargoHash = "sha256-9jOrDFLnzjxqN2h6e1/qKRn5RQKlfyeKKmjZthQX3jM=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ libxcb ]
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
|
|||
cython
|
||||
trezor
|
||||
keepkey
|
||||
btchip
|
||||
btchip-python
|
||||
hidapi
|
||||
pyopenssl
|
||||
pyscard
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ python3.pkgs.buildPythonApplication {
|
|||
requests
|
||||
tlslite-ng
|
||||
# plugins
|
||||
btchip
|
||||
btchip-python
|
||||
ckcc-protocol
|
||||
keepkey
|
||||
trezor
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ python3.pkgs.buildPythonApplication {
|
|||
requests
|
||||
tlslite-ng
|
||||
# plugins
|
||||
btchip
|
||||
btchip-python
|
||||
ckcc-protocol
|
||||
keepkey
|
||||
trezor
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ python3.pkgs.buildPythonApplication {
|
|||
requests
|
||||
tlslite-ng
|
||||
# plugins
|
||||
btchip
|
||||
btchip-python
|
||||
ckcc-protocol
|
||||
keepkey
|
||||
trezor
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@ let
|
|||
version = "2.0.3";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0=";
|
||||
hash = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0=";
|
||||
};
|
||||
});
|
||||
flask-wtf = super.flask-wtf.overridePythonAttrs (old: rec {
|
||||
version = "0.15.1";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
sha256 = "ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc";
|
||||
hash = "sha256-/xdxhfiRMC3CU0N/5jCB56RqTpmsph3+CG+yPlT/8tw=";
|
||||
};
|
||||
disabledTests = [
|
||||
"test_outside_request"
|
||||
|
|
@ -33,7 +33,7 @@ let
|
|||
version = "2.0.3";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
sha256 = "b863f8ff057c522164b6067c9e28b041161b4be5ba4d0daceeaa50a163822d3c";
|
||||
hash = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw=";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
|
@ -44,7 +44,7 @@ in python.pkgs.buildPythonApplication rec {
|
|||
|
||||
src = python.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a4e2ee83932755d29ac39c1e74005ec289880fd2d4d2164f09fe2464a294d720";
|
||||
hash = "sha256-pOLug5MnVdKaw5wedABewomID9LU0hZPCf4kZKKU1yA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ python3Packages.buildPythonApplication rec {
|
|||
pname = "gnome-secrets";
|
||||
version = "7.2";
|
||||
format = "other";
|
||||
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, python3Packages, intltool, glib, itstool
|
||||
{ lib, fetchFromGitHub, python3Packages, intltool, glib, itstool, gtk3
|
||||
, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
|
|
@ -28,6 +28,7 @@ python3Packages.buildPythonApplication rec {
|
|||
pango
|
||||
gdk-pixbuf
|
||||
atk
|
||||
gtk3
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
@ -37,10 +38,6 @@ python3Packages.buildPythonApplication rec {
|
|||
dbus-python
|
||||
];
|
||||
|
||||
# Setup hooks have trouble with strict deps.
|
||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
# Arguments to be passed to `makeWrapper`, only used by buildPython*
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ let
|
|||
version = "1.0.18";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "09h1153wgr5x2ny7ds0w2m81n3bb9j8hjb8sjfnrg506r01clkyx";
|
||||
hash = "sha256-3U/KAsgGlJetkxotCZFMaw0bUBUc6Ha8Fb3kx0cJASY=";
|
||||
};
|
||||
});
|
||||
# Use click 7
|
||||
|
|
@ -20,7 +20,7 @@ let
|
|||
version = "7.1.2";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a";
|
||||
hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo=";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
|
@ -37,7 +37,7 @@ buildPythonApplication rec {
|
|||
owner = "donnemartin";
|
||||
repo = pname;
|
||||
rev = "811a5804c09406465b2b02eab638c08bf5c4fa7f";
|
||||
sha256 = "1g3dfsyk4727d9jh9w6j5r51ag07851cls7v7a7hmdvdixpvbzp6";
|
||||
hash = "sha256-5v61b49ttwqPOvtoykJBBzwVSi7S8ARlakccMr12bbw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@
|
|||
, shared-mime-info
|
||||
, wrapGAppsHook
|
||||
, wafHook
|
||||
, bash
|
||||
, dbus
|
||||
}:
|
||||
|
||||
with python3Packages;
|
||||
|
|
@ -33,14 +35,12 @@ buildPythonApplication rec {
|
|||
itstool # for help pages
|
||||
desktop-file-utils # for update-desktop-database
|
||||
shared-mime-info # for update-mime-info
|
||||
docutils # for rst2man
|
||||
dbus # for detection of dbus-send during build
|
||||
];
|
||||
buildInputs = [ docutils libwnck keybinder3 ];
|
||||
buildInputs = [ libwnck keybinder3 bash ];
|
||||
propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
|
||||
|
||||
# without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk'
|
||||
# see https://github.com/NixOS/nixpkgs/issues/56943 for details
|
||||
strictDeps = false;
|
||||
|
||||
postInstall = ''
|
||||
gappsWrapperArgs+=(
|
||||
"--prefix" "PYTHONPATH" : "${makePythonPath propagatedBuildInputs}"
|
||||
|
|
|
|||
|
|
@ -84,13 +84,12 @@ buildPythonApplication rec {
|
|||
sha256 = "sha256-rsiXm7L/M85ot6NrTyy//lMRFlLPJYve9y6Erg9Ugxg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
|
||||
buildInputs = [
|
||||
atk
|
||||
gdk-pixbuf
|
||||
glib-networking
|
||||
gnome-desktop
|
||||
gobject-introspection
|
||||
gtk3
|
||||
libnotify
|
||||
pango
|
||||
|
|
@ -139,9 +138,6 @@ buildPythonApplication rec {
|
|||
"--prefix PATH : ${lib.makeBinPath requiredTools}"
|
||||
"\${gappsWrapperArgs[@]}"
|
||||
];
|
||||
# needed for glib-schemas to work correctly (will crash on dialogues otherwise)
|
||||
# see https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://lutris.net";
|
||||
|
|
|
|||
|
|
@ -31,18 +31,14 @@ python3Packages.buildPythonApplication rec {
|
|||
runHook postCheck
|
||||
'';
|
||||
|
||||
# Cannot find GSettings schemas when opening settings,
|
||||
# probably https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
wrapGAppsHook
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib-networking
|
||||
gobject-introspection
|
||||
gtk3
|
||||
];
|
||||
|
||||
|
|
@ -64,6 +60,7 @@ python3Packages.buildPythonApplication rec {
|
|||
];
|
||||
|
||||
# Run Linux games using the Steam Runtime by using steam-run in the wrapper
|
||||
# FIXME: not working with makeBinaryWrapper
|
||||
postFixup = ''
|
||||
sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run}/bin/steam-run#' -i $out/bin/minigalaxy
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -38,6 +38,17 @@ let
|
|||
nativeBuildInputs = [ ];
|
||||
format = "setuptools";
|
||||
outputs = [ "out" ];
|
||||
patches = [ ];
|
||||
});
|
||||
# downgrade needed for flask-babel 2.0.0
|
||||
babel = super.babel.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.11.0";
|
||||
src = super.fetchPypi {
|
||||
pname = "Babel";
|
||||
inherit version;
|
||||
hash = "sha256-XvSzImsBgN7d7UIpZRyLDho6aig31FoHMnLzE+TPl/Y=";
|
||||
};
|
||||
propagatedBuildInputs = [ self.pytz ];
|
||||
});
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -108,9 +108,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
python3.pkgs.nose
|
||||
];
|
||||
|
||||
# Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
# python deps
|
||||
, python, buildPythonPackage
|
||||
, alembic, beautifulsoup4, chardet, lxml, Mako, pyenchant
|
||||
, alembic, beautifulsoup4, chardet, lxml, mako, pyenchant
|
||||
, pyqt5_with_qtwebkit, pyxdg, sip_4, sqlalchemy, sqlalchemy-migrate
|
||||
}:
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ buildPythonPackage rec {
|
|||
beautifulsoup4
|
||||
chardet
|
||||
lxml
|
||||
Mako
|
||||
mako
|
||||
pyenchant
|
||||
pyqt5_with_qtwebkit
|
||||
pyxdg
|
||||
|
|
|
|||
|
|
@ -32,8 +32,6 @@ python3Packages.buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ let
|
|||
src = self.fetchPypi {
|
||||
pname = "Flask-Migrate";
|
||||
inherit version;
|
||||
sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38";
|
||||
hash = "sha256-ri8FZxWIdi3YOiHYsYxR/jVehng+JFlJlf+Nc4Df/jg=";
|
||||
};
|
||||
});
|
||||
flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (old: rec {
|
||||
|
|
@ -43,7 +43,7 @@ let
|
|||
version = "1.0.1";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c";
|
||||
hash = "sha256-bICx5a02ZSkOo5MguR4b4eDV9gZSuWSjBwIW3oPS5Hw=";
|
||||
};
|
||||
nativeCheckInputs = old.nativeCheckInputs ++ (with self; [
|
||||
requests
|
||||
|
|
@ -55,18 +55,18 @@ let
|
|||
version = "2.11.3";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
sha256 = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y=";
|
||||
hash = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y=";
|
||||
};
|
||||
patches = [
|
||||
# python 3.10 compat fixes. In later upstream releases, but these
|
||||
# are not compatible with flask 1 which we need here :(
|
||||
(fetchpatch {
|
||||
url = "https://github.com/thmo/jinja/commit/1efb4cc918b4f3d097c376596da101de9f76585a.patch";
|
||||
sha256 = "sha256-GFaSvYxgzOEFmnnDIfcf0ImScNTh1lR4lxt2Uz1DYdU=";
|
||||
hash = "sha256-GFaSvYxgzOEFmnnDIfcf0ImScNTh1lR4lxt2Uz1DYdU=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mkrizek/jinja/commit/bd8bad37d1c0e2d8995a44fd88e234f5340afec5.patch";
|
||||
sha256 = "sha256-Uow+gaO+/dH6zavC0X/SsuMAfhTLRWpamVlL87DXDRA=";
|
||||
hash = "sha256-Uow+gaO+/dH6zavC0X/SsuMAfhTLRWpamVlL87DXDRA=";
|
||||
excludes = [ "CHANGES.rst" ];
|
||||
})
|
||||
];
|
||||
|
|
@ -76,21 +76,21 @@ let
|
|||
version = "2.0.1";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
sha256 = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo=";
|
||||
hash = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo=";
|
||||
};
|
||||
});
|
||||
itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec {
|
||||
version = "1.1.0";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19";
|
||||
hash = "sha256-MhsDPQfypBNtPsdi6snxahDM1g9TwMka+QIXrOe6Hxk=";
|
||||
};
|
||||
});
|
||||
flask = super.flask.overridePythonAttrs (old: rec {
|
||||
version = "1.1.4";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
sha256 = "0fbeb6180d383a9186d0d6ed954e0042ad9f18e0e8de088b2b419d526927d196";
|
||||
hash = "sha256-D762GA04OpGG0NbtlU4AQq2fGODo3giLK0GdUmkn0ZY=";
|
||||
};
|
||||
});
|
||||
sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: {
|
||||
|
|
@ -100,13 +100,13 @@ let
|
|||
version = "7.1.2";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a";
|
||||
hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo=";
|
||||
};
|
||||
});
|
||||
# Now requires `lingua` as check input that requires a newer `click`,
|
||||
# however `click-7` is needed by the older flask we need here. Since it's just
|
||||
# for the test-suite apparently, let's skip it for now.
|
||||
Mako = super.Mako.overridePythonAttrs (lib.const {
|
||||
mako = super.mako.overridePythonAttrs (lib.const {
|
||||
nativeCheckInputs = [];
|
||||
doCheck = false;
|
||||
});
|
||||
|
|
@ -165,7 +165,7 @@ python3'.pkgs.buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SYXw8PBCb514v3rcy15W/vZS5JyMsu81D2sJmviLRtw=";
|
||||
hash = "sha256-SYXw8PBCb514v3rcy15W/vZS5JyMsu81D2sJmviLRtw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib
|
||||
, python3
|
||||
, python310
|
||||
, fetchFromGitHub
|
||||
, gdk-pixbuf
|
||||
, gnome
|
||||
|
|
@ -17,11 +17,19 @@
|
|||
}:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
python = python310.override {
|
||||
packageOverrides = (self: super: {
|
||||
matplotlib = super.matplotlib.override {
|
||||
enableGtk3 = true;
|
||||
};
|
||||
sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
|
||||
version = "1.4.46";
|
||||
src = self.fetchPypi {
|
||||
pname = "SQLAlchemy";
|
||||
inherit version;
|
||||
hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";
|
||||
};
|
||||
});
|
||||
});
|
||||
};
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
|
|
@ -77,7 +85,7 @@ in python.pkgs.buildPythonApplication rec {
|
|||
TZ=Europe/Kaliningrad \
|
||||
LC_ALL=en_US.UTF-8 \
|
||||
xvfb-run -s '-screen 0 800x600x24' \
|
||||
${python3.interpreter} setup.py test
|
||||
${python.interpreter} setup.py test
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
pname = "wike";
|
||||
version = "1.7.1";
|
||||
format = "other";
|
||||
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hugolabe";
|
||||
|
|
|
|||
|
|
@ -472,9 +472,6 @@ buildStdenv.mkDerivation ({
|
|||
separateDebugInfo = enableDebugSymbols;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||
NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null;
|
||||
|
||||
# tests were disabled in configureFlags
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -501,41 +498,6 @@ buildStdenv.mkDerivation ({
|
|||
gappsWrapperArgs+=(--argv0 "$out/bin/.${binaryName}-wrapped")
|
||||
'';
|
||||
|
||||
# Workaround: The separateDebugInfo hook skips artifacts whose build ID's length is not 40.
|
||||
# But we got 16-length build ID here. The function body is mainly copied from pkgs/build-support/setup-hooks/separate-debug-info.sh
|
||||
# Remove it when https://github.com/NixOS/nixpkgs/pull/146275 is merged.
|
||||
preFixup = lib.optionalString enableDebugSymbols ''
|
||||
_separateDebugInfo() {
|
||||
[ -e "$prefix" ] || return 0
|
||||
|
||||
local dst="''${debug:-$out}"
|
||||
if [ "$prefix" = "$dst" ]; then return 0; fi
|
||||
|
||||
dst="$dst/lib/debug/.build-id"
|
||||
|
||||
# Find executables and dynamic libraries.
|
||||
local i
|
||||
while IFS= read -r -d $'\0' i; do
|
||||
if ! isELF "$i"; then continue; fi
|
||||
|
||||
# Extract the Build ID. FIXME: there's probably a cleaner way.
|
||||
local id="$($READELF -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')"
|
||||
if [[ -z "$id" ]]; then
|
||||
echo "could not find build ID of $i, skipping" >&2
|
||||
continue
|
||||
fi
|
||||
|
||||
# Extract the debug info.
|
||||
echo "separating debug info from $i (build ID $id)"
|
||||
mkdir -p "$dst/''${id:0:2}"
|
||||
$OBJCOPY --only-keep-debug "$i" "$dst/''${id:0:2}/''${id:2}.debug"
|
||||
|
||||
# Also a create a symlink <original-name>.debug.
|
||||
ln -sfn ".build-id/''${id:0:2}/''${id:2}.debug" "$dst/../$(basename "$i")"
|
||||
done < <(find "$prefix" -type f -print0)
|
||||
}
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString crashreporterSupport ''
|
||||
patchelf --add-rpath "${lib.makeLibraryPath [ curl ]}" $out/lib/${binaryName}/crashreporter
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -57,9 +57,6 @@ stdenv.mkDerivation {
|
|||
"-Daligned_alloc=_mm_malloc"
|
||||
]);
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
|
||||
|
||||
# https://github.com/SerenityOS/serenity/issues/10055
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -add_rpath $out/lib $out/bin/ladybird
|
||||
|
|
|
|||
|
|
@ -66,9 +66,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
requests
|
||||
];
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
# See https://github.com/Flexget/Flexget/blob/master/requirements.txt
|
||||
APScheduler
|
||||
apscheduler
|
||||
beautifulsoup4
|
||||
click
|
||||
colorama
|
||||
|
|
@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec {
|
|||
packaging
|
||||
psutil
|
||||
pynzb
|
||||
PyRSS2Gen
|
||||
pyrss2gen
|
||||
python-dateutil
|
||||
pyyaml
|
||||
rebulk
|
||||
|
|
|
|||
|
|
@ -64,9 +64,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
'';
|
||||
|
||||
# Fix setup-hooks https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Reddit app, built with Python, GTK and Handy; Created with mobile Linux in mind";
|
||||
maintainers = with maintainers; [ dasj19 ];
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
name = "gossa";
|
||||
pname = "gossa";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cinny-desktop";
|
||||
pname = "cinny-desktop";
|
||||
version = "2.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ buildPythonApplication rec {
|
|||
dbus-python
|
||||
pyxdg
|
||||
python-olm
|
||||
];
|
||||
] ++ matrix-nio.optional-dependencies.e2e;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple but convenient CLI-based Matrix client app for sending and receiving";
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ mkDerivation rec {
|
|||
watchgod
|
||||
dbus-python
|
||||
matrix-nio
|
||||
];
|
||||
] ++ matrix-nio.optional-dependencies.e2e;
|
||||
|
||||
qmakeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
|
|
|
|||
|
|
@ -83,9 +83,6 @@ stdenv.mkDerivation rec {
|
|||
"-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389
|
||||
];
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
|
||||
|
||||
preFixup = lib.optionalString voipSupport ''
|
||||
# add gstreamer plugins path to the wrapper
|
||||
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder,
|
||||
attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus,
|
||||
attrs, aiohttp, appdirs, click, keyring, logbook, peewee, janus,
|
||||
prompt-toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3,
|
||||
setuptools, installShellFiles, nixosTests,
|
||||
|
||||
|
|
@ -29,12 +29,14 @@ buildPythonApplication rec {
|
|||
click
|
||||
janus
|
||||
keyring
|
||||
Logbook
|
||||
logbook
|
||||
matrix-nio
|
||||
peewee
|
||||
prompt-toolkit
|
||||
setuptools
|
||||
] ++ lib.optionals enableDbusUi [
|
||||
]
|
||||
++ matrix-nio.optional-dependencies.e2e
|
||||
++ lib.optionals enableDbusUi [
|
||||
dbus-python
|
||||
notify2
|
||||
pygobject3
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
, future
|
||||
, atomicwrites
|
||||
, attrs
|
||||
, Logbook
|
||||
, logbook
|
||||
, pygments
|
||||
, matrix-nio
|
||||
, aiohttp
|
||||
|
|
@ -45,12 +45,12 @@ in buildPythonPackage {
|
|||
future
|
||||
atomicwrites
|
||||
attrs
|
||||
Logbook
|
||||
logbook
|
||||
pygments
|
||||
matrix-nio
|
||||
aiohttp
|
||||
requests
|
||||
];
|
||||
] ++ matrix-nio.optional-dependencies.e2e;
|
||||
|
||||
passthru.scripts = [ "matrix.py" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
, glib
|
||||
, gobject-introspection
|
||||
, folks
|
||||
, bash
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
|
|
@ -39,6 +40,7 @@ python3Packages.buildPythonApplication rec {
|
|||
libsecret
|
||||
gnome-online-accounts
|
||||
folks
|
||||
bash
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -59,9 +61,6 @@ python3Packages.buildPythonApplication rec {
|
|||
# See https://nixos.org/nixpkgs/manual/#ssec-gnome-common-issues-double-wrapped
|
||||
dontWrapGApps = true;
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; ([
|
||||
PyChromecast
|
||||
pychromecast
|
||||
psutil
|
||||
mutagen
|
||||
flask
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ python3Packages.buildPythonPackage rec {
|
|||
aiohttp matrix-api-async aioredis aiosqlite arrow pyyaml motor regex
|
||||
mattermostdriver setuptools voluptuous ibm-watson tailer multidict
|
||||
watchgod get-video-properties appdirs bitstring matrix-nio
|
||||
];
|
||||
] ++ matrix-nio.optional-dependencies.e2e;
|
||||
|
||||
passthru.python = python3Packages.python;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ let
|
|||
|
||||
propagatedBuildInputs = with pypkgs; [
|
||||
twisted
|
||||
Mako
|
||||
mako
|
||||
chardet
|
||||
pyxdg
|
||||
pyopenssl
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {
|
|||
ipy
|
||||
pyperclip
|
||||
] ++
|
||||
lib.optional useGeoIP GeoIP;
|
||||
lib.optional useGeoIP geoip;
|
||||
|
||||
dontBuild = true;
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -41,8 +41,6 @@ buildPythonApplication rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
# To avoid enabling strictDeps = false (#56943)
|
||||
gobject-introspection
|
||||
librsvg
|
||||
pango
|
||||
webkitgtk
|
||||
|
|
|
|||
|
|
@ -67,7 +67,6 @@ python3Packages.buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
format = "other";
|
||||
strictDeps = false; # gobject-introspection does not run with strictDeps (https://github.com/NixOS/nixpkgs/issues/56943)
|
||||
|
||||
checkPhase = "xvfb-run pytest ../tests/";
|
||||
|
||||
|
|
|
|||
|
|
@ -194,10 +194,12 @@ in
|
|||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
env.NIX_CFLAGS_COMPILE = toString ([
|
||||
"-I${librdf_rasqal}/include/rasqal" # librdf_redland refers to rasqal.h instead of rasqal/rasqal.h
|
||||
"-fno-visibility-inlines-hidden" # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10
|
||||
];
|
||||
] ++ optionals (stdenv.isLinux && stdenv.isAarch64 && variant == "still") [
|
||||
"-O2" # https://bugs.gentoo.org/727188
|
||||
]);
|
||||
|
||||
tarballPath = "external/tarballs";
|
||||
|
||||
|
|
|
|||
|
|
@ -14,9 +14,8 @@ python3Packages.buildPythonApplication rec {
|
|||
sha256 = "sha256-iOF11/fhQYlvnpWJidJS1yJVavF7xLxvBl59VCh9A4U=";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk3 gobject-introspection gnome.adwaita-icon-theme ];
|
||||
buildInputs = [ gtk3 gnome.adwaita-icon-theme ];
|
||||
propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ];
|
||||
# see https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663
|
||||
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, php}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
name = "cloudlog";
|
||||
pname = "cloudlog";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ gnuradio.pkgs.mkDerivation rec {
|
|||
cmake
|
||||
pkg-config
|
||||
gnuradio.unwrapped.python
|
||||
gnuradio.unwrapped.python.pkgs.Mako
|
||||
gnuradio.unwrapped.python.pkgs.mako
|
||||
gnuradio.unwrapped.python.pkgs.six
|
||||
];
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ let
|
|||
# building with boost 1.7x fails
|
||||
++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ];
|
||||
pythonNative = with python.pkgs; [
|
||||
Mako
|
||||
mako
|
||||
six
|
||||
];
|
||||
};
|
||||
|
|
@ -118,7 +118,7 @@ let
|
|||
gnuradio-companion = {
|
||||
pythonRuntime = with python.pkgs; [
|
||||
pyyaml
|
||||
Mako
|
||||
mako
|
||||
numpy
|
||||
pygobject3
|
||||
];
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ let
|
|||
# building with boost 1.7x fails
|
||||
++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ];
|
||||
pythonNative = with python.pkgs; [
|
||||
Mako
|
||||
mako
|
||||
six
|
||||
];
|
||||
};
|
||||
|
|
@ -118,7 +118,7 @@ let
|
|||
gnuradio-companion = {
|
||||
pythonRuntime = with python.pkgs; [
|
||||
pyyaml
|
||||
Mako
|
||||
mako
|
||||
numpy
|
||||
pygobject3
|
||||
];
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ let
|
|||
# building with boost 1.7x fails
|
||||
++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ];
|
||||
pythonNative = with python.pkgs; [
|
||||
Mako
|
||||
mako
|
||||
six
|
||||
];
|
||||
};
|
||||
|
|
@ -120,7 +120,7 @@ let
|
|||
gnuradio-companion = {
|
||||
pythonRuntime = with python.pkgs; [
|
||||
pyyaml
|
||||
Mako
|
||||
mako
|
||||
numpy
|
||||
pygobject3
|
||||
];
|
||||
|
|
|
|||
|
|
@ -85,8 +85,8 @@ stdenv.mkDerivation rec {
|
|||
++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]
|
||||
;
|
||||
|
||||
# Python + Mako are always required for the build itself but not necessary for runtime.
|
||||
pythonEnv = python3.withPackages (ps: with ps; [ Mako ]
|
||||
# Python + mako are always required for the build itself but not necessary for runtime.
|
||||
pythonEnv = python3.withPackages (ps: with ps; [ mako ]
|
||||
++ optionals (enableLibuhd_Python_api) [ numpy setuptools ]
|
||||
++ optionals (enableUtils) [ requests six ]
|
||||
);
|
||||
|
|
|
|||
|
|
@ -83,8 +83,8 @@ stdenv.mkDerivation rec {
|
|||
++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]
|
||||
;
|
||||
|
||||
# Python + Mako are always required for the build itself but not necessary for runtime.
|
||||
pythonEnv = python3.withPackages (ps: with ps; [ Mako ]
|
||||
# Python + mako are always required for the build itself but not necessary for runtime.
|
||||
pythonEnv = python3.withPackages (ps: with ps; [ mako ]
|
||||
++ optionals (enablePythonApi) [ numpy setuptools ]
|
||||
++ optionals (enableUtils) [ requests six ]
|
||||
);
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec {
|
|||
] ++ (with python3Packages; [
|
||||
biopython
|
||||
psutil
|
||||
XlsxWriter
|
||||
xlsxwriter
|
||||
]);
|
||||
|
||||
# Tests rely on some of the databases being available, which is not bundled
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "muscle";
|
||||
pname = "muscle";
|
||||
version = "5.1.0";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rcedgar";
|
||||
repo = "${name}";
|
||||
repo = pname;
|
||||
rev = "${version}";
|
||||
hash = "sha256-NpnJziZXga/T5OavUt3nQ5np8kJ9CFcSmwyg4m6IJsk=";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "veryfasttree";
|
||||
pname = "veryfasttree";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "citiususc";
|
||||
repo = "${name}";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AOzbxUnrn1qgscjdOKf4dordnSKtIg3nSVaYWK1jbuc=";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ in python.pkgs.buildPythonApplication rec {
|
|||
numpy
|
||||
packaging
|
||||
pyqt4
|
||||
Rtree
|
||||
rtree
|
||||
scipy
|
||||
setuptools
|
||||
shapely
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
, setuptools
|
||||
, textx
|
||||
, xlrd
|
||||
, XlsxWriter
|
||||
, xlsxwriter
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
|
|
@ -70,7 +70,7 @@ buildPythonApplication rec {
|
|||
setuptools
|
||||
textx
|
||||
xlrd
|
||||
XlsxWriter
|
||||
xlsxwriter
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "readstat";
|
||||
pname = "readstat";
|
||||
version = "1.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ python3Packages.buildPythonApplication rec {
|
|||
pname = "bada-bib";
|
||||
version = "0.8.0";
|
||||
format = "other";
|
||||
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RogerCrocker";
|
||||
|
|
|
|||
|
|
@ -210,9 +210,6 @@ stdenv.mkDerivation rec {
|
|||
"-Druntime_cxxmodules=OFF"
|
||||
];
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
|
||||
|
||||
# Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}.
|
||||
# TODO: Remove the [DY]LDLIBRARY_PATH prefix for xrootd when #200830 get merged.
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -26,11 +26,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU=";
|
||||
};
|
||||
|
||||
# Strict deps breaks guake
|
||||
# See https://github.com/NixOS/nixpkgs/issues/59930
|
||||
# and https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xterm";
|
||||
version = "378";
|
||||
version = "379";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
|
||||
"https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
|
||||
];
|
||||
hash = "sha256-ZJ37/V7dDtnkfPjk2VO0sNPDC8KAFm38T/0Ulz/sPpI=";
|
||||
hash = "sha256-p93ydO6EuX+xKDZ1AJ1Tyi0CoP/VzlpRGNr8NiPrsxA=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -20,6 +20,11 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
nativeCheckInputs = [ python3.pkgs.pytestCheckHook git mercurial];
|
||||
|
||||
disabledTests = [
|
||||
# fails due to more aggressive setuptools version specifier validation
|
||||
"test_parse_default_pattern"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bump version numbers in project files";
|
||||
homepage = "https://pypi.org/project/bumpver/";
|
||||
|
|
|
|||
|
|
@ -52,10 +52,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
pycairo
|
||||
];
|
||||
|
||||
# gobject-introspection and some other similar setup hooks do not currently work with strictDeps.
|
||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs meson_shebang_normalisation.py
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@ let
|
|||
version = "7.1.2";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj";
|
||||
hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo=";
|
||||
};
|
||||
});
|
||||
|
||||
PyChromecast = super.PyChromecast.overridePythonAttrs (oldAttrs: rec {
|
||||
pychromecast = super.pychromecast.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "9.2.0";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
|
|
@ -40,6 +40,7 @@ with py.pkgs;
|
|||
buildPythonApplication rec {
|
||||
pname = "catt";
|
||||
version = "0.12.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
|
@ -49,7 +50,7 @@ buildPythonApplication rec {
|
|||
propagatedBuildInputs = [
|
||||
click
|
||||
ifaddr
|
||||
PyChromecast
|
||||
pychromecast
|
||||
protobuf
|
||||
requests
|
||||
yt-dlp
|
||||
|
|
|
|||
|
|
@ -15,17 +15,8 @@ in buildPythonApplication rec {
|
|||
sha256 = "1xb7acjphvn4ya8fgjsvag5gzi9a6c2famfl0ffr8nhb9y8ig9mg";
|
||||
};
|
||||
|
||||
# Temporary fix
|
||||
# See https://github.com/NixOS/nixpkgs/issues/61578
|
||||
# and https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext wrapGAppsHook
|
||||
|
||||
# Temporary fix
|
||||
# See https://github.com/NixOS/nixpkgs/issues/61578
|
||||
# and https://github.com/NixOS/nixpkgs/issues/56943
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ buildPythonApplication rec {
|
|||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
propagatedBuildInputs = [
|
||||
PyChromecast bottle pycaption paste html5lib pygobject3 dbus-python
|
||||
pychromecast bottle pycaption paste html5lib pygobject3 dbus-python
|
||||
gtk3 gobject-introspection
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -40,9 +40,6 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = with python3Packages; [ pygobject3 pyxdg pycairo dbus-python xlib ];
|
||||
|
||||
# workaround https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
patches = [
|
||||
# Fix paths
|
||||
(substituteAll {
|
||||
|
|
|
|||
|
|
@ -44,10 +44,10 @@ python3.pkgs.buildPythonApplication rec {
|
|||
itstool
|
||||
python3
|
||||
wrapGAppsHook
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gobject-introspection
|
||||
gtk3
|
||||
libpeas
|
||||
librsvg
|
||||
|
|
@ -78,12 +78,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
patchShebangs ./getenvvar.py
|
||||
'';
|
||||
|
||||
# Fixes error
|
||||
# Couldn’t recognize the image file format for file ".../share/pitivi/pixmaps/asset-proxied.svg"
|
||||
# at startup, see https://github.com/NixOS/nixpkgs/issues/56943
|
||||
# and https://github.com/NixOS/nixpkgs/issues/89691#issuecomment-714398705.
|
||||
strictDeps = false;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "pitivi";
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ buildPythonApplication rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-TIzZ0h0jdBJ5PRi9MxEASe6a+Nqz/iwhO70HM5WbCbc=";
|
||||
hash = "sha256-TIzZ0h0jdBJ5PRi9MxEASe6a+Nqz/iwhO70HM5WbCbc=";
|
||||
};
|
||||
|
||||
# lots of networking and other fails
|
||||
|
|
|
|||
|
|
@ -58,6 +58,10 @@ stdenv.mkDerivation rec {
|
|||
# crypto/jitterentropy.c:54:3: error: #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c."
|
||||
hardeningDisable = [ "format" "fortify" ];
|
||||
|
||||
# Fixes the following error when using liblkl-hijack.so on aarch64-linux:
|
||||
# symbol lookup error: liblkl-hijack.so: undefined symbol: __aarch64_ldadd4_sync
|
||||
env.NIX_CFLAGS_LINK = "-lgcc_s";
|
||||
|
||||
makeFlags = [
|
||||
"-C tools/lkl"
|
||||
"CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
wrapGAppsHook
|
||||
libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi
|
||||
gsettings-desktop-schemas libosinfo gtksourceview4
|
||||
gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
|
||||
] ++ lib.optional spiceSupport spice-gtk;
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -25,7 +25,9 @@
|
|||
, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
|
||||
, propagateDoc ? bintools != null && bintools ? man
|
||||
, extraPackages ? [], extraBuildCommands ? ""
|
||||
, isGNU ? bintools.isGNU or false, isLLVM ? bintools.isLLVM or false
|
||||
, isGNU ? bintools.isGNU or false
|
||||
, isLLVM ? bintools.isLLVM or false
|
||||
, isCCTools ? bintools.isCCTools or false
|
||||
, buildPackages ? {}
|
||||
, targetPackages ? {}
|
||||
, useMacosReexportHack ? false
|
||||
|
|
@ -139,6 +141,7 @@ stdenv.mkDerivation {
|
|||
local dst="$1"
|
||||
local wrapper="$2"
|
||||
export prog="$3"
|
||||
export use_response_file_by_default=${if isCCTools then "1" else "0"}
|
||||
substituteAll "$wrapper" "$out/bin/$dst"
|
||||
chmod +x "$out/bin/$dst"
|
||||
}
|
||||
|
|
@ -183,7 +186,9 @@ stdenv.mkDerivation {
|
|||
done
|
||||
|
||||
'' + (if !useMacosReexportHack then ''
|
||||
wrap ${targetPrefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${targetPrefix}ld}
|
||||
if [ -e ''${ld:-$ldPath/${targetPrefix}ld} ]; then
|
||||
wrap ${targetPrefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${targetPrefix}ld}
|
||||
fi
|
||||
'' else ''
|
||||
ldInner="${targetPrefix}ld-reexport-delegate"
|
||||
wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${targetPrefix}ld}
|
||||
|
|
@ -191,10 +196,9 @@ stdenv.mkDerivation {
|
|||
unset ldInner
|
||||
'') + ''
|
||||
|
||||
for variant in ld.gold ld.bfd ld.lld; do
|
||||
local underlying=$ldPath/${targetPrefix}$variant
|
||||
[[ -e "$underlying" ]] || continue
|
||||
wrap ${targetPrefix}$variant ${./ld-wrapper.sh} $underlying
|
||||
for variant in $ldPath/${targetPrefix}ld.*; do
|
||||
basename=$(basename "$variant")
|
||||
wrap $basename ${./ld-wrapper.sh} $variant
|
||||
done
|
||||
'';
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue