jiebi/CodeConvo huggingface dataset:
} }, "node_modules/@eslint-community/regexpp": { <del> "version": "4.9.1", "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz", "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==", </del> <ins> "version": "4.10.0", "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", </ins> "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
"dev": true }, "node_modules/@types/node": { <del> "version": "18.18.6", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.6.tgz", "integrity": "sha512-wf3Vz+jCmOQ2HV1YUJuCWdL64adYxumkrxtc+H1VUQlnQI04+5HtH+qZCOE21lBE7gIrt+CwX2Wv8Acrw5Ak6w==", "dev": true </del> <ins> "version": "18.18.7", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.7.tgz", "integrity": "sha512-bw+lEsxis6eqJYW8Ql6+yTqkE6RuFtsQPSe5JxXbqYRFQEER5aJA9a5UH9igqDWm3X4iLHIKOHlnAXLM4mi7uQ==", "dev": true, "dependencies": { "undici-types": "~5.26.4" } </ins> }, "node_modules/@types/normalize-package-data": { "version": "2.4.3",
"dev": true }, "node_modules/@types/react": { <del> "version": "18.2.31", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.31.tgz", "integrity": "sha512-c2UnPv548q+5DFh03y8lEDeMfDwBn9G3dRwfkrxQMo/dOtRHUUO57k6pHvBIfH/VF4Nh+98mZ5aaSe+2echD5g==", </del> <ins> "version": "18.2.33", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.33.tgz", "integrity": "sha512-v+I7S+hu3PIBoVkKGpSYYpiBT1ijqEzWpzQD62/jm4K74hPpSP7FF9BnKG6+fg2+62weJYkkBWDJlZt5JO/9hg==", </ins> "dev": true, "dependencies": { "@types/prop-types": "*",
"through": "^2.3.8" } }, <ins> "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", "dev": true }, </ins> "node_modules/union-value": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
<del> { lib , buildGoModule , fetchFromGitHub , makeBinaryWrapper , pkg-config , libGL , libxkbcommon , xorg , wayland , vulkan-headers , wine64Packages , fetchpatch , fetchFromGitLab , fetchurl , }: let stagingPatch = fetchFromGitLab { sha256 = "sha256-VQ4j4PuXRoXbCUZ16snVO+jRvuKD4Rjn14R7bhwdAco="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; rev = "v9.2"; }; wine = wine64Packages.staging.overrideDerivation (oldAttrs: { prePatch = '' patchShebangs tools cp -r ${stagingPatch}/patches ${stagingPatch}/staging . chmod +w patches patchShebangs ./patches/gitapply.sh python3 ./staging/patchinstall.py --destdir="$PWD" --all ''; patches = (oldAttrs.patches or [ ]) ++ [ (fetchurl { name = "childwindow.patch"; hash = "sha256-u3mDvlbhQnfh2tUKb8jNJA0tTcLIaKVLfY8ktJmeRns="; url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/9f43ce33a691afb50562d95adfc6719a3b58ddb7/patches/wine/childwindow.patch"; }) (fetchpatch { name = "mouselock.patch"; hash = "sha256-0AGA4AQbxTL5BGVbm072moav7xVA3zpotYqM8pcEDa4="; url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/9f43ce33a691afb50562d95adfc6719a3b58ddb7/patches/wine/mouselock.patch"; }) (fetchpatch { name = "segregrevert.patch"; hash = "sha256-+3Nld81nG3GufI4jAF6yrWfkJmsSCOku39rx0Hov29c="; url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/9f43ce33a691afb50562d95adfc6719a3b58ddb7/patches/wine/segregrevert.patch"; }) ]; src = fetchFromGitLab rec { sha256 = "sha256-GlPH34dr9aHx7xvlcbtDMn/wrY//DP58ilXjhQXgihQ="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine"; rev = "wine-9.2"; }; }); in buildGoModule rec { pname = "vinegar"; version = "1.7.5"; src = fetchFromGitHub { owner = "vinegarhq"; repo = "vinegar"; rev = "v${version}"; hash = "sha256-eU6xlmgz8X7q51GSkQlz/kEQgTzzXYw5P6Yr47f7hbs="; }; vendorHash = "sha256-O2AQFcJmYY3FtLXB3BPdzsplFbthYEyasfctpPOQVhs="; nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; buildInputs = [ libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wayland vulkan-headers wine ]; buildPhase = '' runHook preBuild make PREFIX=$out runHook postBuild ''; installPhase = '' runHook preInstall make PREFIX=$out install runHook postInstall ''; postInstall = '' wrapProgram $out/bin/vinegar  --prefix PATH : ${lib.makeBinPath [wine]} ''; meta = with lib; { description = "Open-source, minimal, configurable, fast bootstrapper for running Roblox on Linux"; homepage = "https://github.com/vinegarhq/vinegar"; changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}"; mainProgram = "vinegar"; license = licenses.gpl3Only; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nyanbinary ]; }; } </del>
gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17 grafana_reporter = grafana-reporter; # Added 2024-06-09 gr-ais = throw "'gr-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 <ins> grapefruit = throw "'grapefruit' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23 </ins> graylog = throw "graylog is now available in versions 3.3 up to 5.0. Please mind the upgrade path and choose the appropriate version. Direct upgrading from 3.3 to 4.3 or above is not supported"; # Added 2023-04-24 graylog-3_3 = throw "graylog 3.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 3.x to latest series."; # Added 2023-10-09 graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09
vikunja-frontend = throw "'vikunja-frontend' has been replaced by 'vikunja'"; # Added 2024-02-19 vimHugeX = vim-full; # Added 2022-12-04 vim_configurable = vim-full; # Added 2022-12-04 <ins> vinegar = throw "'vinegar' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23 </ins> virtmanager = throw "'virtmanager' has been renamed to/replaced by 'virt-manager'"; # Converted to throw 2023-09-10 virtmanager-qt = throw "'virtmanager-qt' has been renamed to/replaced by 'virt-manager-qt'"; # Converted to throw 2023-09-10 vivaldi-widevine = throw "'vivaldi-widevine' has been renamed to/replaced by 'widevine-cdm'"; # Added 2023-02-25
defaultShellPath = lib.makeBinPath defaultShellUtils; <ins> bashWithDefaultShellUtils = writeShellApplication { name = "bash"; runtimeInputs = defaultShellUtils; text = '' if [[ "$PATH" == "/no-such-path" ]]; then export PATH=${defaultShellPath} fi exec ${bash}/bin/bash "$@" ''; }; </ins> platforms = lib.platforms.linux ++ lib.platforms.darwin; system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux";
# If you add more replacements here, you must change the grep above! # Only files containing /bin are taken into account. substituteInPlace "$path"  <del> --replace /bin/bash ${bash}/bin/bash  --replace "/usr/bin/env bash" ${bash}/bin/bash  </del> <ins> --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash  --replace "/usr/bin/env bash" ${bashWithDefaultShellUtils}/bin/bash  </ins> --replace "/usr/bin/env python" ${python3}/bin/python  --replace /usr/bin/env ${coreutils}/bin/env  --replace /bin/true ${coreutils}/bin/true
# bazel test runner include references to /bin/bash substituteInPlace tools/build_rules/test_rules.bzl  <del> --replace /bin/bash ${bash}/bin/bash </del> <ins> --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash </ins> for i in $(find tools/cpp/ -type f) do substituteInPlace $i  <del> --replace /bin/bash ${bash}/bin/bash </del> <ins> --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash </ins> done # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. substituteInPlace scripts/bootstrap/compile.sh  <del> --replace /bin/bash ${bash}/bin/bash </del> <ins> --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash </ins> # add nix environment vars to .bazelrc cat >> .bazelrc <<EOF
in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches + genericPatches; <del> buildInputs = [buildJdk] ++ defaultShellUtils; </del> <ins> buildInputs = [buildJdk bashWithDefaultShellUtils] ++ defaultShellUtils; </ins> # when a command can’t be found in a bazel build, you might also # need to add it to `defaultShellPath`.
inherit (protobuf) name src; inherit disabled doCheck; <ins> # work around python distutils compiling C++ with $CC NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; </ins> propagatedBuildInputs = [ protobuf google_apputils ]; buildInputs = [ google_apputils pyext ];
<ins> { lib , stdenvNoCC , fetchFromGitHub , gtk3 , breeze-icons , gnome-icon-theme , hicolor-icon-theme }: stdenvNoCC.mkDerivation { pname = "gruvbox-plus-icons"; version = "unstable-2023-12-07"; src = fetchFromGitHub { owner = "SylEleuth"; repo = "gruvbox-plus-icon-pack"; rev = "f3109979fe93b31ea14eb2d5c04247a895302ea0"; sha256 = "sha256-EijTEDkPmcDcMhCuL6fOWjU9eXFUwmeOEwfGlxadb1U="; }; nativeBuildInputs = [ gtk3 ]; propagatedBuildInputs = [ breeze-icons gnome-icon-theme hicolor-icon-theme ]; installPhase = '' runHook preInstall mkdir -p $out/share/icons cp -r Gruvbox-Plus-Dark $out/share/icons/ gtk-update-icon-cache $out/share/icons/Gruvbox-Plus-Dark runHook postInstall ''; dontDropIconThemeCache = true; dontBuild = true; dontConfigure = true; meta = with lib; { description = "Icon pack for Linux desktops based on the Gruvbox color scheme"; homepage = "https://github.com/SylEleuth/gruvbox-plus-icon-pack"; license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ eureka-cpu RGBCube ]; }; } </ins>
packages.into_par_iter().try_for_each(|package| { eprintln!("{}", package.name); <del> let tarball = package.tarball()?; </del> <ins> let tarball = package .tarball() .map_err(|e| anyhow!("couldn't fetch {} at {}: {e:?}", package.name, package.url))?; </ins> let integrity = package.integrity().map(ToString::to_string); cache
} if let UrlOrString::Url(v) = &package.version { <del> for (scheme, host) in [ ("github", "github.com"), ("bitbucket", "bitbucket.org"), ("gitlab", "gitlab.com"), ] { if v.scheme() == scheme { package.version = { let mut new_url = initial_url.clone(); new_url.set_host(Some(host))?; if v.path().ends_with(".git") { new_url.set_path(v.path()); } else { new_url.set_path(&format!("{}.git", v.path())); } new_url.set_fragment(v.fragment()); UrlOrString::Url(new_url) }; break; </del> <ins> if v.scheme() == "npm" { if let Some(UrlOrString::Url(ref url)) = &package.resolved { package.version = UrlOrString::Url(url.clone()); } } else { for (scheme, host) in [ ("github", "github.com"), ("bitbucket", "bitbucket.org"), ("gitlab", "gitlab.com"), ] { if v.scheme() == scheme { package.version = { let mut new_url = initial_url.clone(); new_url.set_host(Some(host))?; if v.path().ends_with(".git") { new_url.set_path(v.path()); } else { new_url.set_path(&format!("{}.git", v.path())); } new_url.set_fragment(v.fragment()); UrlOrString::Url(new_url) }; break; } </ins> } } }
Some(Hash(String::from("sha512-foo"))) ); } <ins> #[test] fn parse_lockfile_correctly() { let packages = packages( r#"{ "name": "node-ddr", "version": "1.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { "string-width-cjs": { "version": "npm:string-width@4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } } } }"#).unwrap(); assert_eq!(packages.len(), 1); assert_eq!( packages[0].resolved, Some(UrlOrString::Url( Url::parse("https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz") .unwrap() )) ); } </ins> }
<ins> { lib , python3 , fetchFromGitHub }: let python = python3.override { packageOverrides = self: super: { lark = super.lark.overridePythonAttrs (old: rec { # gdtoolkit needs exactly this lark version version = "0.8.0"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; hash = "sha256-KN9buVlH8hJ8t0ZP5yefeYM5vH5Gg7a7TEDGKJYpozs="; fetchSubmodules = true; }; patches = [ ]; }); }; }; in python.pkgs.buildPythonApplication rec { pname = "gdtoolkit3"; version = "3.5.0"; # If we try to get using fetchPypi it requires GeoIP (but the package dont has that dep!?) src = fetchFromGitHub { owner = "Scony"; repo = "godot-gdscript-toolkit"; rev = version; hash = "sha256-cMGD5Xdf9ElS1NT7Q0NPB//EvUO0MI0VTtps5JRisZ4="; }; disabled = python.pythonOlder "3.7"; propagatedBuildInputs = with python.pkgs; [ docopt lark pyyaml setuptools ]; doCheck = true; nativeCheckInputs = with python.pkgs; [ pytestCheckHook hypothesis ]; preCheck = '' # The tests want to run the installed executables export PATH=$out/bin:$PATH # gdtoolkit tries to write cache variables to $HOME/.cache export HOME=$TMP ''; # The tests are not working on NixOS disabledTests = [ "test_cc_on_empty_file_succeeds" "test_cc_on_file_with_single_function_succeeds" ]; pythonImportsCheck = [ "gdtoolkit" "gdtoolkit.formatter" "gdtoolkit.linter" "gdtoolkit.parser" ]; meta = with lib; { description = "Independent set of tools for working with Godot's GDScript - parser, linter and formatter"; homepage = "https://github.com/Scony/godot-gdscript-toolkit"; license = licenses.mit; maintainers = with maintainers; [ shiryel tmarkus ]; }; } </ins>
<ins> { lib , python3 , fetchFromGitHub }: let python = python3.override { packageOverrides = self: super: { lark = super.lark.overridePythonAttrs (old: rec { # gdtoolkit needs exactly this lark version version = "1.1.9"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; hash = "sha256-vDu+VPAXONY8J+A6oS7EiMeOMgzGms0nWpE+DKI1MVU="; fetchSubmodules = true; }; patches = [ ]; }); }; }; in python.pkgs.buildPythonApplication rec { pname = "gdtoolkit"; version = "4.2.2"; src = fetchFromGitHub { owner = "Scony"; repo = "godot-gdscript-toolkit"; rev = version; hash = "sha256-SvEKKuDnfxV+5AArg5ssrQzgIwRITdek4KYEs3d0n4Y="; }; disabled = python.pythonOlder "3.7"; propagatedBuildInputs = with python.pkgs; [ docopt lark pyyaml setuptools ]; doCheck = true; nativeCheckInputs = with python.pkgs; [ pytestCheckHook hypothesis ]; preCheck = '' # The tests want to run the installed executables export PATH=$out/bin:$PATH # gdtoolkit tries to write cache variables to $HOME/.cache export HOME=$TMP ''; # The tests are not working on NixOS disabledTestPaths = [ "tests/generated/test_expression_parsing.py" "tests/gdradon/test_executable.py" ]; pythonImportsCheck = [ "gdtoolkit" "gdtoolkit.formatter" "gdtoolkit.linter" "gdtoolkit.parser" ]; meta = with lib; { description = "Independent set of tools for working with Godot's GDScript - parser, linter and formatter"; homepage = "https://github.com/Scony/godot-gdscript-toolkit"; license = licenses.mit; maintainers = with maintainers; [ squarepear ]; }; } </ins>
<del> { lib , python3 , fetchFromGitHub , godot3-server }: let python = python3.override { packageOverrides = self: super: { lark = super.lark.overridePythonAttrs (old: rec { # gdtoolkit needs exactly this lark version version = "0.8.0"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; hash = "sha256-KN9buVlH8hJ8t0ZP5yefeYM5vH5Gg7a7TEDGKJYpozs="; fetchSubmodules = true; }; patches = [ ]; }); }; }; in python.pkgs.buildPythonApplication rec { pname = "gdtoolkit"; version = "3.3.1"; # If we try to get using fetchPypi it requires GeoIP (but the package dont has that dep!?) src = fetchFromGitHub { owner = "Scony"; repo = "godot-gdscript-toolkit"; rev = version; sha256 = "13nnpwy550jf5qnm9ixpxl1bwfnhhbiys8vqfd25g3aim4bm3gnn"; }; disabled = python.pythonOlder "3.7"; propagatedBuildInputs = with python.pkgs; [ docopt lark pyyaml setuptools ]; doCheck = true; nativeCheckInputs = with python.pkgs; [ pytestCheckHook hypothesis godot3-server ]; preCheck = let godotServerMajorVersion = lib.versions.major godot3-server.version; gdtoolkitMajorVersion = lib.versions.major version; msg = '' gdtoolkit major version ${gdtoolkitMajorVersion} does not match godot-server major version ${godotServerMajorVersion}! gdtoolkit needs a matching godot-server for its tests. If you see this error, you can either: - disable doCheck for gdtoolkit, or - provide a compatible godot-server version to gdtoolkit" ''; in lib.throwIf (godotServerMajorVersion != gdtoolkitMajorVersion) msg '' # The tests want to run the installed executables export PATH=$out/bin:$PATH # gdtoolkit tries to write cache variables to $HOME/.cache export HOME=$TMP # Work around https://github.com/godotengine/godot/issues/20503 # Without this, Godot will complain about a missing project file touch project.godot # Remove broken test case # (hard to skip via disabledTests since the test name contains an absolute path) rm tests/potential-godot-bugs/multiline-subscription-expression.gd ''; pythonImportsCheck = [ "gdtoolkit" "gdtoolkit.formatter" "gdtoolkit.linter" "gdtoolkit.parser" ]; meta = with lib; { description = "Independent set of tools for working with Godot's GDScript - parser, linter and formatter"; homepage = "https://github.com/Scony/godot-gdscript-toolkit"; license = licenses.mit; maintainers = with maintainers; [ shiryel tmarkus ]; }; } </del>
godot-headless = throw "godot-headless has been renamed to godot3-headless to distinguish from version 4"; # Added 2023-07-16 godot-server = throw "godot-server has been renamed to godot3-server to distinguish from version 4"; # Added 2023-07-16 <ins> gdtoolkit = throw "gdtoolkit has been renamed to gdtoolkit_3 to distinguish from version 4"; # Added 2024-02-17 </ins> google-chrome-beta = throw "'google-chrome-beta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10
existing process, but will need to start that process from gdb (so it is a child). Or you can set `boot.kernel.sysctl."kernel.yama.ptrace_scope"` to 0. <ins> - Gitea 1.21 upgrade has several breaking changes, including: - Custom themes and other assets that were previously stored in `custom/public/*` now belong in `custom/public/assets/*` - New instances of Gitea using MySQL now ignore the `[database].CHARSET` config option and always use the `utf8mb4` charset, existing instances should migrate via the `gitea doctor convert` CLI command. </ins> - The `hardware.pulseaudio` module now sets permission of pulse user home directory to 755 when running in "systemWide" mode. It fixes [issue 114399](https://github.com/NixOS/nixpkgs/issues/114399).
buildGoModule rec { pname = "gitea"; <del> version = "1.20.5"; </del> <ins> version = "1.21.1"; </ins> # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz"; <del> hash = "sha256-cH/AHsFXOdvfSfj9AZUd3l/RlYE06o1ByZu0vvGQuXw="; </del> <ins> hash = "sha256-5WEHUMQsQNgrglS+xJ4IWHUl0a6RLLPyx0l+ECJ4R9g="; </ins> }; vendorHash = null;
{ lib, stdenv, fetchFromGitHub, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2 <del> , gcc, python3Packages, perl, perlPackages, makeWrapper, fetchpatch }: </del> <ins> , gcc, python3Packages, perl, perlPackages, makeWrapper, }: </ins> stdenv.mkDerivation rec { pname = "john"; <del> version = "1.9.0-jumbo-1"; </del> <ins> version = "rolling-2404"; </ins> src = fetchFromGitHub { owner = "openwall"; <del> repo = pname; rev = "1.9.0-Jumbo-1"; sha256 = "sha256-O1iPh5QTMjZ78sKvGbvSpaHFbBuVc1z49UKTbMa24Rs="; </del> <ins> repo = "john"; rev = "f9fedd238b0b1d69181c1fef033b85c787e96e57"; hash = "sha256-zvoN+8Sx6qpVg2JeRLOIH1ehfl3tFTv7r5wQZ44Qsbc="; </ins> }; <del> patches = [ (fetchpatch { name = "fix-gcc-11-struct-allignment-incompatibility.patch"; url = "https://github.com/openwall/john/commit/154ee1156d62dd207aff0052b04c61796a1fde3b.patch"; sha256 = "sha256-3rfS2tu/TF+KW2MQiR+bh4w/FVECciTooDQNTHNw31A="; }) (fetchpatch { name = "improve-apple-clang-pseudo-intrinsics-portability.patch"; url = "https://github.com/openwall/john/commit/c9825e688d1fb9fdd8942ceb0a6b4457b0f9f9b4.patch"; excludes = [ "doc/*" ]; sha256 = "sha256-hgoiz7IgR4f66fMP7bV1F8knJttY8g2Hxyk3QfkTu+g="; }) ]; </del> postPatch = '' sed -ri -e ' s!^(#defines+CFG_[A-Z]+_NAMEs+).*/!1"'"$out"'/etc/john/!
# Use the Nix-provided libxml2 instead of the system-provided one. substituteInPlace libhb/module.defs  --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 <ins> '' + optionalString useGtk '' substituteInPlace gtk/module.rules  --replace-fail '$(MESON.exe)' 'meson'  --replace-fail '$(NINJA.exe)' 'ninja'  # Force using nixpkgs dependencies substituteInPlace gtk/meson.build  --replace-fail "cc.find_library('bz2', dirs: hb_libdirs)" "cc.find_library('bz2')"  --replace-fail "cc.find_library('mp3lame', dirs: hb_libdirs)" "cc.find_library('mp3lame')"  --replace-fail  "hb_incdirs = include_directories(hb_dir / 'libhb', hb_dir / 'contrib/include')"  "hb_incdirs = include_directories(hb_dir / 'libhb')"  </ins> ''; nativeBuildInputs = [
# NOTE: 2018-12-27: Check NixOS HandBrake test if changing NIX_LDFLAGS = [ "-lx265" ]; <ins> # meson/ninja are used only for the subprojects, not the toplevel dontUseMesonConfigure = true; dontUseMesonInstall = true; dontUseNinjaBuild = true; dontUseNinjaInstall = true; </ins> makeFlags = [ "--directory=build" ]; <del> passthru.tests = { basic-conversion = </del> <ins> passthru = { # for convenience inherit ffmpeg-hb x265-hb; tests.basic-conversion = </ins> let # Big Buck Bunny example, licensed under CC Attribution 3.0. testMkv = fetchurl {
HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160 test -e test.mkv ''; <del> version = testers.testVersion { package = self; command = "HandBrakeCLI --version"; }; </del> <ins> tests.version = testers.testVersion { package = self; command = "HandBrakeCLI --version"; }; </ins> }; meta = with lib; {
license = licenses.gpl2Only; maintainers = with maintainers; [ Anton-Latukha wmertens ]; platforms = with platforms; unix; <del> broken = stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"; </del> <ins> broken = stdenv.isDarwin;  # https://github.com/NixOS/nixpkgs/pull/297984#issuecomment-2016503434 </ins> }; }; in
substituteInPlace $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W --replace /opt "$out/opt" <del> mkdir -p $out/lib/cups/filter </del> <ins> mkdir -p $out/lib/cups/filter $out/share/cups/model </ins> ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W $out/lib/cups/filter/brother_lpdwrapper_HL1210W <del> ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brother-HL1210W-cups-en.ppd $out/lib/cups/filter/brother-HL1210W-cups-en.ppd </del> <ins> ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brother-HL1210W-cups-en.ppd $out/share/cups/model/ </ins> # cp brcupsconfig4 $out/opt/brother/Printers/HL1110/cupswrapper/ ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4
owner = "VCVRack"; repo = "Rack"; rev = "v${version}"; <del> sha256 = "0azrqyx5as4jmk9dxb7cj7x9dha81i0mm9pkvdv944qyccqwg55i"; </del> <ins> hash = "sha256-Gn/sFltLXX2mLv4dDqmr/UPd+JBXVkIZGwMI6Rm0Ih4="; </ins> }; patches = [
cp -r ${fundamental-source} plugins/Fundamental/ chmod -R +rw plugins/Fundamental # will be used as build dir substituteInPlace plugin.mk --replace ":= all" ":= dist" <ins> substituteInPlace plugins/Fundamental/src/Logic.cpp  --replace  "LightButton<VCVBezelBig, VCVBezelLightBig<WhiteLight>>"  "struct rack::componentlibrary::LightButton<VCVBezelBig, VCVBezelLightBig<WhiteLight>>" </ins> # Fix reference to zenity substituteInPlace dep/osdialog/osdialog_zenity.c