jiebi/CodeConvo huggingface dataset:
ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi ''; <del> postStart = mkBefore '' until ${pkgs.curl.bin}/bin/curl -s -o /dev/null ${cfg.listenAddress}:${toString cfg.port}; do sleep 1 done ''; </del> }; environment.systemPackages = [ cfg.package ];
, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss , pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand <ins> , wayland </ins> , branch , common-updater-scripts, withOpenASAR ? false }:
for i in *; do [ ! -e "/var/lib/cups/$i" ] && ln -s "${rootdir}/etc/cups/$i" "/var/lib/cups/$i" done <ins> #update path reference [ -L /var/lib/cups/path ] &&  rm /var/lib/cups/path [ ! -e /var/lib/cups/path ] &&  ln -s ${bindir} /var/lib/cups/path </ins> ${optionalString cfg.gutenprint '' if [ -d /var/lib/cups/ppd ]; then ${gutenprint}/bin/cups-genppdupdate -p /var/lib/cups/ppd
mkDerivationWith python3.pkgs.buildPythonApplication rec { pname = "openshot-qt"; <del> version = "2.6.1"; </del> <ins> version = "3.0.0"; </ins> src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; <del> hash = "sha256-29fAg4SDoAFzv6q43Dcs2HdaeKZfPEzlGqCcICiPSF0="; </del> <ins> hash = "sha256-h4R2txi038m6tzdKYiXIB8CiqWt2MFFRNerp1CFP5as="; </ins> }; nativeBuildInputs = [
export HOME=$(mktemp -d) ''; <del> # Following Arch PKGBUILD for Python 3.10 compatibility # https://github.com/OpenShot/openshot-qt/issues/4608 # https://github.com/archlinux/svntogit-community/commits/packages/openshot/trunk patches = [ (fetchpatch { name = "video-widget.patch"; url = "https://github.com/OpenShot/openshot-qt/commit/9748a13268d66a5949aebc970637b5903756d018.patch"; hash = "sha256-QwLtcooDJeYWDp80a1dUFo2so/zEWqqsq5IgkXWX324="; }) (fetchpatch { name = "python-3.10-int.patch"; url = "https://github.com/OpenShot/openshot-qt/commit/fff785eb1e3e0c30ed6ca57e2d1933aaa807ae22.patch"; hash = "sha256-ee/s7rhF71ot5oPkGK+j59mL1B3e72xoH27KFoDL8s8="; }) ]; </del> doCheck = false; dontWrapGApps = true;
stdenv.mkDerivation rec { pname = "libopenshot"; <del> version = "0.2.7"; </del> <ins> version = "0.3.0"; </ins> src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; <del> sha256 = "sha256-aF8wrPxFIjCy5gw72e/WyL/Wcx9tUGDkrqHS+ZDVK0U="; </del> <ins> sha256 = "sha256-qe866gFhcbd7yCNXDiZ9Aj0TAiWoJ+r7C5BjtWBKSGA="; </ins> }; postPatch = ''
pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; <del> version = "7.19.0"; </del> <ins> version = "7.24.3"; </ins> src = fetchurl { <del> url = "https://registry.npmjs.org/pnpm/-/pnpm-7.19.0.tgz"; sha512 = "0ZPqlBY9M5fqKI9Ya0kEB7PQj7Pg7bYEjXbRbg4pNnJIObzXeO+PaK/8FBd8KMgJe5QpLb6rn2nVFHNSNoz+kw=="; </del> <ins> url = "https://registry.npmjs.org/pnpm/-/pnpm-7.24.3.tgz"; sha512 = "0fpP1l16xOY8YwsATSLodNNBa7bitV1cNY475fioVLR7Thx5tkCtdp3xIlvZYX8ZoPtedLhGn3fICC409HQSNQ=="; </ins> }; buildInputs = globalBuildInputs; meta = {
<ins> { lib, fetchzip }: fetchzip rec { pname = "capitaine-cursors-themed"; version = "5"; stripRoot = false; url = "https://github.com/sainnhe/capitaine-cursors/releases/download/r${version}/Linux.zip"; sha256 = "jQNAXuR/OtvohWziGYgb5Ni2/tEIGaY9HIyUUW793EY="; postFetch = '' mkdir -p $out/share/icons cp -r ./ $out/share/icons ''; meta = with lib; { description = "A fork of the capitaine cursor theme, with some additional variants (Gruvbox, Nord, Palenight) and support for HiDPI"; homepage = "https://github.com/sainnhe/capitaine-cursors"; license = licenses.lgpl3Only; platforms = platforms.unix; maintainers = [ maintainers.math-42 ]; }; } </ins>
<del> { poetry2nix, pkgs, lib }: </del> <ins> { lib , python3 , fetchFromGitHub }: </ins> <del> let pythonPackages = (poetry2nix.mkPoetryPackages { projectDir = ./.; overrides = [ poetry2nix.defaultPoetryOverrides (import ./poetry-git-overlay.nix { inherit pkgs; }) (self: super: { </del> <ins> python3.pkgs.buildPythonApplication rec { pname = "rmfuse"; version = "unstable-2021-06-06"; </ins> <del> rmfuse = super.rmfuse.overridePythonAttrs(old: { meta = old.meta // { description = "RMfuse provides access to your reMarkable Cloud files in the form of a FUSE filesystem."; longDescription = '' RMfuse provides access to your reMarkable Cloud files in the form of a FUSE filesystem. These files are exposed either in their original format, or as PDF files that contain your annotations. This lets you manage files in the reMarkable Cloud using the same tools you use on your local system. ''; license = lib.licenses.mit; homepage = "https://github.com/rschroll/rmfuse"; maintainers = [ lib.maintainers.adisbladis ]; }; }); </del> <ins> format = "pyproject"; </ins> <del> reportlab = let ft = pkgs.freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in super.reportlab.overridePythonAttrs(old: { postPatch = '' substituteInPlace setup.py  --replace "mif = findFile(d,'ft2build.h')" "mif = findFile('${lib.getDev ft}','ft2build.h')" ''; </del> <ins> src = fetchFromGitHub { owner = "rschroll"; repo = "rmfuse"; rev = "3796b8610c8a965a60a417fc0bf8ea5200b71fd2"; hash = "sha256-W3kS6Kkmp8iWMOYFL7r1GyjSQvFotBXQCuTMK0vyHQ8="; }; </ins> <del> NIX_CFLAGS_COMPILE = "-I${pkgs.freetype}/include/freetype2"; </del> <ins> postPatch = '' substituteInPlace pyproject.toml  --replace 'bidict = "^' 'bidict = ">=' ''; </ins> <del> nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; buildInputs = old.buildInputs ++ [ pkgs.freetype ]; }); </del> <ins> nativeBuildInputs = with python3.pkgs; [ poetry-core ]; </ins> <del> }) ]; }).python.pkgs; in pythonPackages.rmfuse </del> <ins> propagatedBuildInputs = with python3.pkgs; [ bidict rmrl rmcl pyfuse3 xdg ]; meta = { description = "FUSE access to the reMarkable Cloud"; homepage = "https://github.com/rschroll/rmfuse"; license = lib.licenses.mit; longDescription = '' RMfuse provides access to your reMarkable Cloud files in the form of a FUSE filesystem. These files are exposed either in their original format, or as PDF files that contain your annotations. This lets you manage files in the reMarkable Cloud using the same tools you use on your local system. ''; maintainers = with lib.maintainers; [ adisbladis ]; }; } </ins>
<del> { pkgs }: self: super: { rmfuse = super.rmfuse.overridePythonAttrs ( _: { src = pkgs.fetchgit { url = "https://github.com/rschroll/rmfuse.git"; rev = "3796b8610c8a965a60a417fc0bf8ea5200b71fd2"; sha256 = "03qxy95jpk741b81bd38y51d4a0vynx2y1g662bci9r6m7l14yav"; }; } ); } </del>
<del> [tool.poetry] name = "rmfuse-env" version = "0.1.0" description = "" authors = [] [tool.poetry.dependencies] python = "^3.8" rmfuse = {git = "https://github.com/rschroll/rmfuse.git", extras = ["pyfuse3"]} [tool.poetry.dev-dependencies] [build-system] requires = ["poetry-core>=1.0.0"] build-backend = "poetry.core.masonry.api" </del>
boost = boost179; }; <del> libreoffice-qt = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { </del> <ins> libreoffice-qt-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { </ins> unwrapped = libsForQt5.callPackage ../applications/office/libreoffice (libreoffice-args // { kdeIntegration = true; variant = "fresh"; }); }); <ins> libreoffice-qt-fresh-unwrapped = libreoffice-qt-fresh.unwrapped; libreoffice-qt-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { unwrapped = libsForQt5.callPackage ../applications/office/libreoffice (libreoffice-args // { kdeIntegration = true; variant = "still"; }); }); libreoffice-qt-still-unwrapped = libreoffice-qt-still.unwrapped; </ins> libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { unwrapped = callPackage ../applications/office/libreoffice
<ins> { lib , stdenvNoCC , fetchurl , unzip }: stdenvNoCC.mkDerivation rec { pname = "roboto-serif"; version = "1.007"; src = fetchurl { url = "https://github.com/googlefonts/roboto-serif/releases/download/v${version}/RobotoSerifFonts-v${version}.zip"; hash = "sha256-A14GztkTvaLBvcm1i3A0Vi9vaz77nFYYoSNggqbffFo="; }; sourceRoot = "."; nativeBuildInputs = [ unzip ]; installPhase = '' runHook preInstall install -Dm644 variable/*.ttf -t $out/share/fonts/truetype runHook postInstall ''; meta = with lib; { description = "The Roboto family of fonts"; longDescription = '' Google’s signature family of fonts, the default font on Android and Chrome OS, and the recommended font for Google’s visual language, Material Design. ''; homepage = "https://github.com/googlefonts/roboto-serif"; license = licenses.ofl; maintainers = with maintainers; [ wegank ]; platforms = platforms.all; }; } </ins>
then [ package ] ++ extraPackages else [ package32 ] ++ extraPackages32; in prevLibs ++ additionalLibs; <ins> extraPkgs = p: (cfg.extraPackages ++ lib.optionals (prev ? extraPkgs) (prev.extraPkgs p)); </ins> } // lib.optionalAttrs (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice) { buildFHSEnv = pkgs.buildFHSEnv.override {
''; }; <ins> extraPackages = lib.mkOption { type = lib.types.listOf lib.types.package; default = [ ]; example = lib.literalExpression '' with pkgs; [ gamescope ] ''; description = '' Additional packages to add to the Steam environment. ''; }; </ins> extraCompatPackages = lib.mkOption { type = lib.types.listOf lib.types.package; default = [ ];
''; }; <ins> fontPackages = lib.mkOption { type = lib.types.listOf lib.types.package; default = config.fonts.packages; defaultText = lib.literalExpression "fonts.packages"; example = lib.literalExpression "with pkgs; [ source-han-sans ]"; description = '' Font packages to use in Steam. Defaults to system fonts, but could be overridden to use other fonts — useful for users who would like to customize CJK fonts used in Steam. According to the [upstream issue](https://github.com/ValveSoftware/steam-for-linux/issues/10422#issuecomment-1944396010), Steam only follows the per-user fontconfig configuration. ''; }; </ins> remotePlay.openFirewall = lib.mkOption { type = lib.types.bool; default = false;
# compile, because it uses "#include_next <limits.h>" to find the # limits.h file in ../includes-fixed. To remedy the problem, # another -idirafter is necessary to add that directory again. <del> # # We use --sysroot=/nix/store/does/not/exist to drop embedded default # path to glibc headers gcc was built against. Without it -idirafter # only appends to the list and outdated glibc headers end up being # used. 'cc-cflags-before' is used to allow user's --sysroot= option # to override our default. </del> + optionalString (libc != null) ('' touch "$out/nix-support/libc-cflags" touch "$out/nix-support/libc-ldflags" echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-crt1-cflags '' + optionalString (!(cc.langD or false)) '' <del> echo "--sysroot=/nix/store/does/not/exist" >> $out/nix-support/cc-cflags-before </del> echo "-idirafter ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags '' + optionalString (isGNU && (!(cc.langD or false))) '' for dir in "${cc}"/lib/gcc/*/*/include-fixed; do
git ]; <del> # Workaround cc-wrapper's --sysroot= value for `staging-next`: it # breaks library lookup via RUNPATH: #   ld: warning: libm.so.6, needed by ./generated/linux/release/64/lib.so, not found (try using -rpath or -rpath-link) #   ld: /build/druntime/generated/linux/release/64/libdruntime.so: undefined reference to `log10@GLIBC_2.2.5' # TODO(trofi): remove the workaround once cc-wrapper is fixed. NIX_CFLAGS_COMPILE = [ "--sysroot=/" ]; </del> buildInputs = [ curl tzdata
NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [ "-UPIPE_SEARCH_DIR" "-DPIPE_SEARCH_DIR="${placeholder "opencl"}/lib/gallium-pipe"" <del> # Work around regression from https://github.com/NixOS/nixpkgs/pull/210004 # TODO(trofi): remove "--sysroot=/" </del> ]; passthru = {
passAsFile = [ "extraConfig" ]; <del> # Workaround '-idirafter' ordering bug in staging-next: #   https://github.com/NixOS/nixpkgs/pull/210004 # where libc '-idirafter' gets added after user's idirafter and # breaks. # TODO(trofi): remove it in staging once fixed in cc-wrapper. preConfigure = '' export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] buildPackages.stdenv.hostPlatform.config}=$(< ${buildPackages.stdenv.cc}/nix-support/libc-cflags) export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"]               stdenv.hostPlatform.config}=$(<               ${stdenv.cc}/nix-support/libc-cflags) ''; </del> configurePhase = '' runHook preConfigure
substituteInPlace src/util/genfsimg --replace "	syslinux " "	true " ''; # calling syslinux on a FAT image isn't going to work <del> # Workaround '-idirafter' ordering bug in staging-next: #   https://github.com/NixOS/nixpkgs/pull/210004 # where libc '-idirafter' gets added after user's idirafter and # breaks. # TODO(trofi): remove it in staging once fixed in cc-wrapper. preConfigure = '' export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] buildPackages.stdenv.hostPlatform.config}=$(< ${buildPackages.stdenv.cc}/nix-support/libc-cflags) export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"]               stdenv.hostPlatform.config}=$(<               ${stdenv.cc}/nix-support/libc-cflags) ''; </del> # not possible due to assembler code hardeningDisable = [ "pic" "stackprotector" ];
sourceRoot = "source/src"; <del> # Workaround '-idirafter' ordering bug in staging-next: #   https://github.com/NixOS/nixpkgs/pull/210004 # where libc '-idirafter' gets added after user's idirafter and # breaks. # TODO(trofi): remove it in staging once fixed in cc-wrapper. preConfigure = '' export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] stdenv.hostPlatform.config}=$(< ${stdenv.cc}/nix-support/libc-cflags) ''; </del> buildInputs = [ libbfd zlib libiberty ]; makeFlags = [ "wimboot.x86_64.efi" ];
{ lib, stdenv, llvm_meta <del> , monorepoSrc, runCommand </del> <ins> , monorepoSrc, runCommand, fetchpatch </ins> , cmake, ninja, python3, fixDarwinDylibNames, version , cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi , libcxxabi, libcxxrt, libunwind
patches = [ ./gnu-install-dirs.patch <ins> # See: #   - https://reviews.llvm.org/D133566 #   - https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432 # !!! Drop in LLVM 16+ (fetchpatch { url = "https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59.patch"; hash = "sha256-AaM9A6tQ4YAw7uDqCIV4VaiUyLZv+unwcOqbakwW9/k="; relative = "libcxx"; }) </ins> ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ../../libcxx-0001-musl-hacks.patch ];
# libcxxStdenv broken # fix in https://github.com/NixOS/nixpkgs/pull/216273 <del> (filter (n: n != "llvmPackages_15")) </del> ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # libcxx does not build for some reason on aarch64-linux (filter (n: n != "llvmPackages_7"))
, pydot , pyhamcrest , pymongo <ins> , pytest-xdist </ins> , pytestCheckHook , python , python-dateutil <del> , pythonAtLeast </del> , pythonRelaxDepsHook , pytz , pyyaml <ins> , regex </ins> , requests , requests-mock , scikit-learn <del> , setuptools </del> , sqlalchemy , tenacity , testcontainers , typing-extensions <ins> , zstandard </ins> }: buildPythonPackage rec { pname = "apache-beam"; <del> version = "2.43.0"; </del> <ins> version = "2.44.0"; </ins> src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "refs/tags/v${version}"; <del> sha256 = "sha256-lqGXCC66eyBnHcK06k9knggX5C+2d0m6xBAI5sh0RHo="; </del> <ins> hash = "sha256-5fnZxv2ZkFlv8vGDIt/6EL41v9P1iKa1tEd1nezq+PU="; </ins> }; patches = [
hash = "sha256-iUmnzrItTFM98w3mpadzrmtI3t0fucpSujAg/6qxCGk="; stripLen = 2; }) <del> (fetchpatch { # https://github.com/apache/beam/pull/24573 name = "relax-httplib2-version.patch"; url = "https://github.com/apache/beam/commit/4045503575ae5ccef3de8d7b868c54e37fef658b.patch"; hash = "sha256-YqT+sHaa1R9vLQnEQN2K0lYoCdnGoPY9qduGBpXPaek="; stripLen = 2; }) </del> ]; pythonRelaxDeps = [ # See https://github.com/NixOS/nixpkgs/issues/156957 "dill" "numpy" <del> "pyarrow" </del> "pymongo" # See https://github.com/NixOS/nixpkgs/issues/193613 "protobuf" <ins> # As of apache-beam v2.44.0, the requirement is httplib2>=0.8,<0.21.0, but # the current (2023-02-08) nixpkgs's httplib2 version is 0.21.0. This can be # removed once beam is upgraded since the current requirement on master is # for httplib2>=0.8,<0.22.0. "httplib2" </ins> ]; sourceRoot = "source/sdks/python";
# Fails starting from dill 0.3.6 because it tries to pickle pytest globals: # https://github.com/uqfoundation/dill/issues/482#issuecomment-1139017499. "apache_beam/transforms/window_test.py" <ins> # See https://github.com/apache/beam/issues/25390. "apache_beam/coders/slow_coders_test.py" "apache_beam/dataframe/pandas_doctests_test.py" "apache_beam/typehints/typed_pipeline_test.py" "apache_beam/coders/fast_coders_test.py" "apache_beam/dataframe/schemas_test.py" </ins> ]; disabledTests = [
, libXtst, libvorbis, hunspell, lzo, xz, bzip2, libiconv , qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake , wrapQtAppsHook <ins> , wrapGAppsHook </ins> , withCC ? true, opencc , withEpwing ? true, libeb , withExtraTiff ? true, libtiff
--replace "opencc.2" "opencc" ''; <del> nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; </del> <ins> nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook wrapGAppsHook ]; </ins> buildInputs = [ qtbase qtsvg qtwebkit qttools libvorbis hunspell xz lzo
nativeBuildInputs = [ cmake perl pkgconfig ]; <del> buildInputs = [ gtk3 vte pcre glib ]; </del> <ins> buildInputs = [ makeWrapper gtk3 vte pcre glib ]; # Wrapper sets path to gsettings-schemata so sakura knows where to find colorchooser, fontchooser ... postInstall = "wrapProgram $out/bin/sakura --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/"; </ins> meta = with stdenv.lib; { description = "A terminal emulator based on GTK and VTE";
makeFlags = [ "-e" ]; makeFlagsArray="LIBS=-lgc"; <del> meta = { </del> <ins> meta = with stdenv.lib ; { </ins> description = "Follow a symlink and print out its target file"; longDescription = '' A commandline program that chases symbolic filesystems links to the original file ''; homepage = "https://qa.debian.org/developer.php?login=rotty%40debian.org"; <del> license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.polyrod ]; platforms = stdenv.lib.platforms.all; </del> <ins> license = licenses.gpl2Plus; maintainers = [ maintainers.polyrod ]; platforms = platforms.all; </ins> }; }
# If requested enable modesetting via kernel parameter. boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1" ++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1" <del> ++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"; </del> <ins> ++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1" # proprietary driver is not compiled with support for X86_KERNEL_IBT ++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "ibt=off"; </ins> services.udev.extraRules = ''
platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ]; maintainers = with maintainers; [ jonringer ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" <del> # proprietary driver currently does not support X86_KERNEL_IBT, which is scheduled to be added in linux 6.2 broken = broken || (kernel != null && kernel.kernelAtLeast "6.2"); </del> <ins> inherit broken; </ins> }; };
exit 1 fi <ins> # Resolve symlinks in the init parameter. We need this for some boot loaders # (e.g. boot.loader.generationsDir). closure="$(chroot /sysroot ${pkgs.coreutils}/bin/realpath "$closure")" # Assume the directory containing the init script is the closure. closure="$(dirname "$closure")" </ins> # If we are not booting a NixOS closure (e.g. init=/bin/sh), # we don't know what root to prepare so we don't do anything if ! [ -x "/sysroot$(readlink "/sysroot$closure/prepare-root" || echo "$closure/prepare-root")" ]; then
python3Packages.buildPythonApplication rec { pname = "wpgtk"; <del> version = "6.5.5"; </del> <ins> version = "6.5.7"; </ins> src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = version; <del> sha256 = "sha256-g3flxQNiNta+uL4t21Lhpij8b5yB78SJLGaFpTcm9fE="; </del> <ins> sha256 = "sha256-rHNni0nDghc5kI1sWHAb5ODr4buBz65eUEB1qWpbTTs="; </ins> }; nativeBuildInputs = [
hash = "sha256-4VC1fwQh9L3c5tgLUaC36p9QHL4dR2vkWc2XlNl0Xzw="; }; <del> # Disable version check </del> postPatch = '' <ins> # Drop broken version specifier sed -i '/python_requires/d' setup.py # Disable version check </ins> substituteInPlace raphodo/constants.py  --replace "disable_version_check = False" "disable_version_check = True" '';
<ins> --- src/Makefile	2023-05-25 18:16:56.000296653 +0900 +++ src/Makefile	2023-05-25 18:17:00.772272861 +0900 @@ -23,7 +23,6 @@ EXTRA_TARGETS  = libs/amiga/amiga.s libs/powzix/*.cpp CFLAGS += -msse2 endif -USE_OPENSSL	= 1 endif # -liconv and -fPIC are necessary on Android </ins>
hash = "sha256-uQKTE36pLO8uhrX794utqaDGUeyqRz6zLCQFA7DYkNc="; }; <del> buildInputs = [ bzip2 lzo openssl zlib ]; </del> <ins> patches = [ # Fix errors on x86_64 and _rotl definition (fetchpatch { name = "0001-fix-compile.patch"; url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-compile.patch?h=quickbms&id=a2e3e4638295d7cfe39513bfef9447fb23154a6b"; hash = "sha256-49fT/L4BNzMYnq1SXhFMgSDLybLkz6KSbgKmUpZZu08="; stripLen = 1; }) ] ++ lib.optional (!opensslSupport) ./0002-disable-openssl.patch; buildInputs = [ bzip2 lzo zlib ] ++ lib.optional (opensslSupport) openssl_1_1; </ins> makeFlags = [ "PREFIX=$(out)" ];
<ins> { lib , buildGoModule , fetchFromGitHub }: buildGoModule rec { pname = "scalr-cli"; version = "0.14.5"; src = fetchFromGitHub { owner = "Scalr"; repo = "scalr-cli"; rev = "v${version}"; hash = "sha256-X/fZDM1OYw1a0la8os9TFUrl1h5BnO+C40h2XH32vmw="; }; vendorHash = "sha256-EdDhq6LnxagutxjiOoYElhHVnSKhr/Ekt928gSooPYY="; ldflags = [ "-s" "-w" ]; preConfigure = '' # Set the version. substituteInPlace main.go --replace '"0.0.0"' '"${version}"' ''; postInstall = '' mv $out/bin/cli $out/bin/scalr ''; doCheck = false; # Skip tests as they require creating actual Scalr resources. meta = with lib; { description = "A command-line tool that communicates directly with the Scalr API."; homepage = "https://github.com/Scalr/scalr-cli"; changelog = "https://github.com/Scalr/scalr-cli/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ dylanmtaylor ]; mainProgram = "scalr"; platforms = platforms.unix; }; } </ins>
# determine the version number, there might be different ones per architecture version = { <del> x86_64-linux = "19.16.0.0.0"; </del> <ins> x86_64-linux = "21.9.0.0.0"; </ins> aarch64-linux = "19.10.0.0.0"; <del> x86_64-darwin = "19.3.0.0.0"; </del> <ins> x86_64-darwin = "19.8.0.0.0"; </ins> }.${stdenv.hostPlatform.system} or throwSystem; directory = { <del> x86_64-linux = "1916000"; </del> <ins> x86_64-linux = "219000"; </ins> aarch64-linux = "191000"; <del> x86_64-darwin = "193000"; </del> <ins> x86_64-darwin = "198000"; </ins> }.${stdenv.hostPlatform.system} or throwSystem; # hashes per component and architecture hashes = { x86_64-linux = { <del> basic = "sha256-Sq1rWvbC1YME7EjSYPaP2g+1Xxxkk4ZkGaBmLo2cKcQ="; sdk = "sha256-yJ8f/Hlq6vZoPxv+dfY4z1E7rWvcqlK+ou0SU0KKlEI="; sqlplus = "sha256-C44srukpCB9et9UWm59daJmU83zr0HAktnWv7R42Irw="; tools = "sha256-GP4E1REIoU3lctVYmLsAiwTJEvGRpCmOFlRuZk+A8HE="; odbc = "sha256-JECxK7Ia1IJtve2goZJdTkvm5NJjqB2rc6k5BXUt3oA="; </del> <ins> basic = "sha256-wiygUvZFYvjp5pndv3b9yTPxe8sC5HZkJ7jZqO1Mss8="; sdk = "sha256-ehqHV52yLRe8ehrKqpLaN0HnN3zjHU7WrfjtqvQadgY="; sqlplus = "sha256-tYvoG+7l5jXyTpxFUYZXaHCT0xGDeah78AinJ2qIsE8="; tools = "sha256-6K2Ni0ZqqpqCrGFrBD06s0QNjNEDtNPrvDQ1U97lTKY="; odbc = "sha256-yTANMLhaEqm9/ZEVqhEn1Gl8eJukgvqpqdaMRjxWxgs="; </ins> }; aarch64-linux = { basic = "sha256-DNntH20BAmo5kOz7uEgW2NXaNfwdvJ8l8oMnp50BOsY=";