jiebi/CodeConvo huggingface dataset:
}; strategy = mkOption { <del> type = types.enum [ "history" "match_prev_cmd" ]; default = "history"; </del> <ins> type = types.listOf (types.enum [ "history" "completion" "match_prev_cmd" ]); default = [ "history" ]; </ins> description = '' <del> Set ZSH_AUTOSUGGEST_STRATEGY to choose the strategy for generating suggestions. There are currently two to choose from: </del> <ins> `ZSH_AUTOSUGGEST_STRATEGY` is an array that specifies how suggestions should be generated. The strategies in the array are tried successively until a suggestion is found. There are currently three built-in strategies to choose from: </ins> <del> * history: Chooses the most recent match. * match_prev_cmd: Chooses the most recent match whose preceding history item matches the most recently executed command (more info). Note that this strategy won't work as expected with ZSH options that don't preserve the history order such as HIST_IGNORE_ALL_DUPS or HIST_EXPIRE_DUPS_FIRST. </del> <ins> - `history`: Chooses the most recent match from history. - `completion`: Chooses a suggestion based on what tab-completion would suggest. (requires `zpty` module) - `match_prev_cmd`: Like `history`, but chooses the most recent match whose preceding history item matches the most recently executed command. Note that this strategy won't work as expected with ZSH options that don't preserve the history order such as `HIST_IGNORE_ALL_DUPS` or `HIST_EXPIRE_DUPS_FIRST`. </ins> ''; };
source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.highlightStyle}" <del> export ZSH_AUTOSUGGEST_STRATEGY=("${cfg.strategy}") </del> <ins> export ZSH_AUTOSUGGEST_STRATEGY=(${concatStringsSep " " cfg.strategy}) </ins> ${optionalString (!cfg.async) "unset ZSH_AUTOSUGGEST_USE_ASYNC"} ${concatStringsSep "n" (mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)}
<ins> { appimageTools, lib, fetchurl }: appimageTools.wrapType2 rec { pname = "cider"; version = "1.3.1308"; src = fetchurl { url = "https://1308-429851205-gh.circle-artifacts.com/0/%7E/Cider/dist/artifacts/Cider-${version}.AppImage"; sha256 = "1lbyvn1c8155p039qfzx7jwad7km073phkmrzjm0w3ahdpwz3wgi"; }; extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; }; in '' mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop  --replace 'Exec=AppRun' 'Exec=${pname}' cp -r ${contents}/usr/share/icons $out/share ''; meta = with lib; { description = "A new look into listening and enjoying Apple Music in style and performance."; homepage = "https://github.com/ciderapp/Cider"; license = licenses.agpl3; maintainers = [ maintainers.cigrainger ]; platforms = [ "x86_64-linux" ]; }; } </ins>
"app-builder-lib": "^22.14.10", "asar": "^2.0.1", "chokidar": "^3.5.2", <del> "electron": "^15.3.5", </del> <ins> "electron": "^17", </ins> "electron-builder": "22.11.4", "electron-builder-squirrel-windows": "22.11.4", "electron-devtools-installer": "^3.1.1",
{ <del> "version": "1.10.4", "desktopSrcHash": "cuMo0wRMC6+un3BQK0+Ecnjvs6HugNk71yElNJarlyc=", "desktopYarnHash": "0llnqwgiqggfcgjyaar2h2r1pyw8m14icfb1pcdphqxrah9gpsar", "webHash": "0vf8npddbx4dmq9c1ghak97jn28b18ssblbrq5smdhlzsnxlpm3l" </del> <ins> "version": "1.10.6", "desktopSrcHash": "TJGYavawLDLbP9Sg7HxIcOkr7hcTfAwk4fyOOEv4KhI=", "desktopYarnHash": "038rqg26dn8chzscck5mlhnw2viy6gr8pjb7zrcmi7ipx9h038a0", "webHash": "1wax4h5gfcq4giyq1igsix748cngky487kwvf69zb1gz95hjds9r" </ins> }
</varlistentry> <varlistentry> <term> <del> GStreamer </del> <ins> GNOME platform </ins> </term> <listitem> <para> <del> Adds the GStreamer plugins subdirectory of each build input to the <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> or <envar>GST_PLUGIN_SYSTEM_PATH</envar> environment variable. </del> <ins> Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in <xref linkend="sec-language-gnome" />. </ins> </para> </listitem> </varlistentry>
<ins> { stdenv , lib , fetchFromGitHub , gitUpdater }: stdenv.mkDerivation rec { pname = "layan-kde"; version = "2022-02-13"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; sha256 = "09z90g13l26v23nwr8n5bapwldp3hhdrdikynvm4vvb7qsvb4vrp"; }; postPatch = '' patchShebangs install.sh substituteInPlace install.sh  --replace '$HOME/.local' $out  --replace '$HOME/.config' $out/share ''; installPhase = '' runHook preInstall name= ./install.sh --dest $out/share/themes mkdir -p $out/share/sddm/themes cp -a sddm/Layan* $out/share/sddm/themes/ runHook postInstall ''; passthru.updateScript = gitUpdater {inherit pname version; }; meta = with lib; { description = "A flat Design theme for KDE Plasma desktop"; homepage = "https://github.com/vinceliuice/Layan-kde"; license = licenses.gpl3Only; platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; } </ins>
runHook preInstall mkdir -p $out/Applications/Slack.app cp -R . $out/Applications/Slack.app <del> '' + lib.optionalString (!stdenv.isAarch64) '' # on aarch64-darwin we get: Could not write domain com.tinyspeck.slackmacgap; exiting /usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -Bool YES '' + '' </del> runHook postInstall ''; };
{ config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile <del> , libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python39Packages </del> <ins> , libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python310Packages </ins> , openvdb, libXxf86vm, tbb, alembic <del> , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath </del> <ins> , zlib, zstd, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath </ins> , jackaudioSupport ? false, libjack2 <del> , cudaSupport ? config.cudaSupport or false, cudatoolkit </del> <ins> , cudaSupport ? config.cudaSupport or false, cudatoolkit_11 </ins> , colladaSupport ? true, opencollada , spaceNavSupport ? stdenv.isLinux, libspnav , makeWrapper
with lib; let <del> python = python39Packages.python; </del> <ins> python = python310Packages.python; </ins> optix = fetchzip { <del> url = "https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip"; sha256 = "1b3ccd3197anya2bj3psxdrvrpfgiwva5zfv2xmyrl73nb2dvfr7"; </del> <ins> # url taken from the archlinux blender PKGBUILD url = "https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip"; sha256 = "0max1j4822mchj0xpz9lqzh91zkmvsn4py0r174cvqfz8z8ykjk8"; </ins> }; in stdenv.mkDerivation rec { pname = "blender"; <del> version = "2.93.5"; </del> <ins> version = "3.1.0"; </ins> src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; <del> sha256 = "1fsw8w80h8k5w4zmy659bjlzqyn5i198hi1kbpzfrdn8psxg2bfj"; </del> <ins> sha256 = "1d0476bzcz86lwdnyjn7hyzkmhfiqh47ls5h09jlbm7v7k9x69hw"; </ins> }; patches = lib.optional stdenv.isDarwin ./darwin.patch; <del> nativeBuildInputs = [ cmake makeWrapper python39Packages.wrapPython llvmPackages.llvm.dev ] </del> <ins> nativeBuildInputs = [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev ] </ins> ++ optionals cudaSupport [ addOpenGLRunpath ]; buildInputs = [ boost ffmpeg gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff <del> opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc </del> <ins> opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib zstd fftw jemalloc </ins> alembic (opensubdiv.override { inherit cudaSupport; }) tbb
llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL ]) ++ optional jackaudioSupport libjack2 <del> ++ optional cudaSupport cudatoolkit </del> <ins> ++ optional cudaSupport cudatoolkit_11 </ins> ++ optional colladaSupport opencollada ++ optional spaceNavSupport libspnav; <del> pythonPath = with python39Packages; [ numpy requests ]; </del> <ins> pythonPath = with python310Packages; [ numpy requests ]; </ins> postPatch = '' # allow usage of dynamically linked embree
--replace '${"$"}{LIBDIR}/opencollada'  '${opencollada}'  --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy'  <del> '${python39Packages.numpy}/${python.sitePackages}/numpy' </del> <ins> '${python310Packages.numpy}/${python.sitePackages}/numpy' </ins> '' else '' substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' '');
"-DPYTHON_VERSION=${python.pythonVersion}" "-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF" <del> "-DPYTHON_NUMPY_PATH=${python39Packages.numpy}/${python.sitePackages}" "-DPYTHON_NUMPY_INCLUDE_DIRS=${python39Packages.numpy}/${python.sitePackages}/numpy/core/include" </del> <ins> "-DPYTHON_NUMPY_PATH=${python310Packages.numpy}/${python.sitePackages}" "-DPYTHON_NUMPY_INCLUDE_DIRS=${python310Packages.numpy}/${python.sitePackages}/numpy/core/include" </ins> "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" "-DWITH_OPENVDB=ON" "-DWITH_TBB=ON"
<del> { config, lib, pkgs, ... }: </del> <ins> { config, pkgs, lib, ... }: </ins> with lib; let cfg = config.services.xserver.windowManager.qtile; <ins> pyEnv = pkgs.python3.withPackages (p: [ (cfg.package.unwrapped or cfg.package) ] ++ (cfg.extraPackages p)); </ins> in { options.services.xserver.windowManager.qtile = { enable = mkEnableOption (lib.mdDoc "qtile"); <del> package = mkPackageOptionMD pkgs "qtile" { }; </del> <ins> package = mkPackageOptionMD pkgs "qtile-unwrapped" { }; configFile = mkOption { type = with types; nullOr path; default = null; example = literalExpression "./your_config.py"; description = lib.mdDoc '' Path to the qtile configuration file. If null, $XDG_CONFIG_HOME/qtile/config.py will be used. ''; }; backend = mkOption { type = types.enum [ "x11" "wayland" ]; default = "x11"; description = lib.mdDoc '' Backend to use in qtile: <option>x11</option> or <option>wayland</option>. ''; }; extraPackages = mkOption { type = types.functionTo (types.listOf types.package); default = _: []; defaultText = literalExpression '' python3Packages: with python3Packages; []; ''; description = lib.mdDoc '' Extra Python packages available to Qtile. An example would be to include `python3Packages.qtile-extras` for additional unoffical widgets. ''; example = literalExpression '' python3Packages: with python3Packages; [ qtile-extras ]; ''; }; </ins> }; config = mkIf cfg.enable { services.xserver.windowManager.session = [{ name = "qtile"; start = '' <del> ${cfg.package}/bin/qtile start & </del> <ins> ${pyEnv}/bin/qtile start -b ${cfg.backend}  ${optionalString (cfg.configFile != null) "--config "${cfg.configFile}""} & </ins> waitPID=$! ''; }];
<ins> { python3, qtile-unwrapped }: (python3.withPackages (_: [ qtile-unwrapped ])).overrideAttrs (_: { # otherwise will be exported as "env", this restores `nix search` behavior name = "${qtile-unwrapped.pname}-${qtile-unwrapped.version}"; # export underlying qtile package passthru = { unwrapped = qtile-unwrapped; }; # restore original qtile attrs inherit (qtile-unwrapped) pname version meta; }) </ins>
qpdfview = libsForQt5.callPackage ../applications/office/qpdfview { }; <del> qtile = callPackage ../applications/window-managers/qtile { }; </del> <ins> qtile-unwrapped = callPackage ../applications/window-managers/qtile { }; qtile = callPackage ../applications/window-managers/qtile/wrapper.nix { }; </ins> vimgolf = callPackage ../games/vimgolf { };
electronLibPath = with lib; makeLibraryPath ( [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ] ++ optionals (versionAtLeast version "9.0.0") [ libdrm mesa ] <ins> ++ optionals (versionOlder version "10.0.0") [ libXScrnSaver ] </ins> ++ optionals (versionAtLeast version "11.0.0") [ libxkbcommon ] ++ optionals (versionAtLeast version "12.0.0") [ libxshmfence ] ++ optionals (versionAtLeast version "17.0.0") [ libglvnd ]
$out/lib/electron/electron  ${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/lib/electron/chrome_crashpad_handler" } <del> wrapProgram $out/lib/electron/electron  --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1  "''${gappsWrapperArgs[@]}" </del> <ins> wrapProgram $out/lib/electron/electron "''${gappsWrapperArgs[@]}" </ins> ''; };
- `getent` has been moved from `glibc`'s `bin` output to its own dedicated output, reducing closure size for many dependents. Dependents using the `getent` alias should not be affected; others should move from using `glibc.bin` or `getBin glibc` to `getent` (which also improves compatibility with non-glibc platforms). <ins> - The `users.users.<name>.passwordFile` has been renamed to `users.users.<name>.hashedPasswordFile` to avoid possible confusions. The option is in fact the file-based version of `hashedPassword`, not `password`, and expects a file containing the {manpage}`crypt(3)` hash of the user password. </ins> - The `services.ananicy.extraRules` option now has the type of `listOf attrs` instead of `string`. - The `matrix-synapse` package & module have undergone some significant internal changes, for most setups no intervention is needed, though:
passwordDescription = '' The options {option}`hashedPassword`, <del> {option}`password` and {option}`passwordFile` </del> <ins> {option}`password` and {option}`hashedPasswordFile` </ins> controls what password is set for the user. {option}`hashedPassword` overrides both <del> {option}`password` and {option}`passwordFile`. {option}`password` overrides {option}`passwordFile`. </del> <ins> {option}`password` and {option}`hashedPasswordFile`. {option}`password` overrides {option}`hashedPasswordFile`. </ins> If none of these three options are set, no password is assigned to the user, and the user will not be able to do password logins. If the option {option}`users.mutableUsers` is true, the
''; }; <del> passwordFile = mkOption { </del> <ins> hashedPasswordFile = mkOption { </ins> type = with types; nullOr str; <del> default = null; </del> <ins> default = cfg.users.${name}.passwordFile; defaultText = literalExpression "null"; </ins> description = lib.mdDoc '' <del> The full path to a file that contains the user's password. The password file is read on each system activation. The file should contain exactly one line, which should be the password in an encrypted form that is suitable for the `chpasswd -e` command. </del> <ins> The full path to a file that contains the hash of the user's password. The password file is read on each system activation. The file should contain exactly one line, which should be the password in an encrypted form that is suitable for the `chpasswd -e` command. </ins> ${passwordDescription} ''; }; <ins> passwordFile = mkOption { type = with types; nullOr (passwdEntry str); default = null; visible = false; description = lib.mdDoc "Deprecated alias of hashedPasswordFile"; }; </ins> initialHashedPassword = mkOption { type = with types; nullOr (passwdEntry str); default = null;
The password hash of user "${user.name}" may be invalid. You must set a valid hash or the user will be locked out of their account. Please check the value of option `users.users."${user.name}".hashedPassword`.'' <del> else null )); </del> <ins> else null) ++ flip mapAttrsToList cfg.users (name: user: if user.passwordFile != null then ''The option `users.users."${name}".passwordFile' has been renamed '' + ''to `users.users."${name}".hashedPasswordFile'.'' else null) ); </ins> }; }
stdenv.mkDerivation rec { pname = "yaru"; <del> version = "22.04.3.1"; </del> <ins> version = "unstable-2022-04-07"; # 22.04.3.1 is broken </ins> src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; <del> rev = version; sha256 = "sha256-nNI6Nm3ZpIJRTbIbe/P9cKofcthb6qWKjn81/ZpPo2g="; </del> <ins> rev = "9bdbf66bf3718c6595c7a15ef4698ba471a36526"; sha256 = "02f6m0jxnsczw3y7v7bqdihxa33sx2z93yn3j8w4z9r9fv2pn06b"; </ins> }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; buildInputs = [ gtk3 gnome.gnome-themes-extra ]; propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; dontDropIconThemeCache = true;
(mkIf (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ]) <del> (mkIf (!cfg.useBootLoader) [ "-kernel ${NIXPKGS_QEMU_KERNEL_${config.system.name}:-${config.system.build.toplevel}/kernel}" </del> <ins> (let alphaNumericChars = lowerChars ++ upperChars ++ (map toString (range 0 9)); # Replace all non-alphanumeric characters with underscores sanitizeShellIdent = s: concatMapStrings (c: if builtins.elem c alphaNumericChars then c else "_") (stringToCharacters s); in mkIf (!cfg.useBootLoader) [ "-kernel ${NIXPKGS_QEMU_KERNEL_${sanitizeShellIdent config.system.name}:-${config.system.build.toplevel}/kernel}" </ins> "-initrd ${config.system.build.toplevel}/initrd" ''-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS"'' ])
stdenv.mkDerivation (rec { pname = "coreutils${optionalString (!minimal) "-full"}"; <del> version = "9.0"; </del> <ins> version = "9.1"; </ins> src = fetchurl { url = "mirror://gnu/coreutils/coreutils-${version}.tar.xz"; <del> sha256 = "sha256-zjCs30pBvFuzDdlV6eqnX6IWtOPesIiJ7TJDPHs7l84="; </del> <ins> sha256 = "sha256:08q4b0w7mwfxbqjs712l6wrwl2ijs7k50kssgbryg9wbsw8g98b1"; </ins> }; <del> patches = [ ./fix-chmod-exit-code.patch # Workaround for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51433 ./disable-seek-hole.patch # Workaround for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=52330 # This patch can be dropped, once we upgrade to the next coreutils version after 9.0 ./fix-arm64-macos.patch ]; </del> postPatch = '' # The test tends to fail on btrfs,f2fs and maybe other unusual filesystems. sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh
nativeBuildInputs = [ perl xz.bin autoreconfHook ] # autoreconfHook is due to patch, normally only needed for cygwin ++ optionals stdenv.hostPlatform.isCygwin [ texinfo ];  # due to patch <del> configureFlags = [ "--with-packager=https://NixOS.org" ] </del> <ins> configureFlags = [ "--with-packager=https://nixos.org" ] </ins> ++ optional (singleBinary != false) ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") ++ optional withOpenssl "--with-openssl"
NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; FORCE_UNSAFE_CONFIGURE = optionalString stdenv.hostPlatform.isSunOS "1"; <ins> NIX_CFLAGS_COMPILE = [] # Work around a bogus warning in conjunction with musl. ++ optional stdenv.hostPlatform.isMusl "-Wno-error" ++ optional stdenv.hostPlatform.isAndroid "-D__USE_FORTIFY_LEVEL=0"; </ins> # Works around a bug with 8.26: # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually).  Stop.
license = licenses.gpl3Plus; platforms = platforms.unix ++ platforms.windows; priority = 10; <del> maintainers = [ maintainers.eelco maintainers.das_j ]; </del> <ins> maintainers = [ maintainers.das_j ]; </ins> }; <del> } // optionalAttrs stdenv.hostPlatform.isMusl { # Work around a bogus warning in conjunction with musl. NIX_CFLAGS_COMPILE = "-Wno-error"; } // lib.optionalAttrs stdenv.hostPlatform.isAndroid { NIX_CFLAGS_COMPILE = "-D__USE_FORTIFY_LEVEL=0"; </del> })
<del> diff --git a/src/copy.c b/src/copy.c index cb9018f93..2a4ccc061 100644 --- a/src/copy.c +++ b/src/copy.c @@ -502,7 +502,7 @@ write_zeros (int fd, off_t n_bytes) return true; } -#ifdef SEEK_HOLE +#if 0 /* Perform an efficient extent copy, if possible.  This avoids the overhead of detecting holes in hole-introducing/preserving copy, and thus makes copying sparse files much more efficient. @@ -1095,7 +1095,7 @@ infer_scantype (int fd, struct stat const *sb, && ST_NBLOCKS (*sb) < sb->st_size / ST_NBLOCKSIZE)) return PLAIN_SCANTYPE; -#ifdef SEEK_HOLE +#if 0 scan_inference->ext_start = lseek (fd, 0, SEEK_DATA); if (0 <= scan_inference->ext_start) return LSEEK_SCANTYPE; @@ -1377,7 +1377,7 @@ copy_reg (char const *src_name, char const *dst_name, off_t n_read; bool wrote_hole_at_eof = false; if (! ( -#ifdef SEEK_HOLE +#if 0 scantype == LSEEK_SCANTYPE ? lseek_copy (source_desc, dest_desc, buf, buf_size, hole_size, scan_inference.ext_start, src_open_sb.st_size, diff --git a/tests/seek-data-capable b/tests/seek-data-capable index cc6372214..6e7a9ec1e 100644 --- a/tests/seek-data-capable +++ b/tests/seek-data-capable @@ -1,5 +1,7 @@ import sys, os, errno, platform +sys.exit(1) + # Pass an _empty_ file if len(sys.argv) != 2: sys.exit(1) </del>
<del> {stdenv, fetchurl, gtk2, pkgconfig, perl, perlXMLParser, libxml2, gettext , python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl , withGNOME ? false, libgnomeui }: </del> <ins> { stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl, perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, gtk-mac-integration }: </ins> stdenv.mkDerivation rec { <del> name = "dia-${minVer}.3"; minVer = "0.97"; </del> <ins> name = "dia-${version}"; version = "0.97.3.20170622"; </ins> <del> src = fetchurl { url = "mirror://gnome/sources/dia/${minVer}/${name}.tar.xz"; sha256 = "0d3x6w0l6fwd0l8xx06y1h56xf8ss31yzia3a6xr9y28xx44x492"; }; correctPersistence = fetchurl { url = https://launchpadlibrarian.net/132677658/persistence; sha256 = "1rv6zv9i03bna4bdp1wzn72lg7kdwi900y1izdq0imibi54nxjsk"; </del> <ins> src = fetchgit { url = git://git.gnome.org/dia; rev = "b86085dfe2b048a2d37d587adf8ceba6fb8bc43c"; sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96"; </ins> }; buildInputs = [ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5 <del> libxslt docbook_xsl libart_lgpl ] ++ stdenv.lib.optional withGNOME libgnomeui; </del> <ins> libxslt docbook_xsl libart_lgpl ] ++ stdenv.lib.optional withGNOME libgnomeui ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration; </ins> <del> nativeBuildInputs = [ pkgconfig intltool perl ]; </del> <ins> nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool perl ]; preConfigure = '' NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough ''; </ins> configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome"; <del> patches = [ ]; </del> <ins> hardeningDisable = [ "format" ]; </ins> # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command # It have no reasons to exist in a redistribuable package postInstall = '' rm $out/share/icons/hicolor/icon-theme.cache <del> cd "$out"/bin/ mv dia .dia-wrapped echo '#! ${stdenv.shell}' >> dia echo 'test -f "$HOME/.dia/persistence" || cp ${correctPersistence} "$HOME/.dia/persistence" ' >> dia echo 'chmod u+rw "$HOME/.dia/persistence" ' >> dia echo ""$out/bin/"'.dia-wrapped" "$@"' >> dia chmod a+x dia </del> ''; meta = { description = "Gnome Diagram drawing software"; homepage = http://live.gnome.org/Dia; maintainers = with stdenv.lib.maintainers; [raskin]; <del> platforms = stdenv.lib.platforms.linux; </del> <ins> platforms = stdenv.lib.platforms.unix; </ins> }; }
"tests/integrations/rq/" # broken since pytest 7.0.1; AssertionError: previous item was not torn down properly "tests/utils/test_contextvars.py" <ins> # broken since Flask and Werkzeug update to 2.1.0 (different error messages) "tests/integrations/flask/test_flask.py" "tests/integrations/bottle/test_bottle.py" "tests/integrations/django/test_basic.py" "tests/integrations/pyramid/test_pyramid.py" ] # test crashes on aarch64 ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [ "tests/test_transport.py" "tests/integrations/threading/test_threading.py" </ins> ]; pythonImportsCheck = [
# `native-image -H:CLibraryPath=''${lib.getLib graalvmXX-ce}/lib ...` and reduce # closure size by not depending on GraalVM $out (that is much bigger) # we always use glibc here, since musl is only supported for static compilation <del> mkdir -p "$lib/lib" </del> for f in "${glibc}/lib/"*; do ln -s "$f" "$lib/lib/$(basename $f)" done