jiebi/CodeConvo huggingface dataset:
<del> { pkgs , buildPythonPackage , fetchPypi , python , azure-mgmt-common }: buildPythonPackage rec { version = "0.20.1"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; sha256 = "97298fc7f133f1d50a974ed6299151eda494a574b0f7fdf8192a388015c2215a"; }; preConfigure = '' # Patch to make this package work on requests >= 2.11.x # CAN BE REMOVED ON NEXT PACKAGE UPDATE sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/compute/computemanagement.py ''; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; propagatedBuildInputs = [ azure-mgmt-common ]; meta = with pkgs.lib; { description = "Microsoft Azure SDK for Python"; homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; maintainers = with maintainers; [ olcai ]; }; } </del>
<del> { pkgs , buildPythonPackage , fetchPypi , azure-mgmt-common , python }: buildPythonPackage rec { version = "0.20.1"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx"; }; preConfigure = '' # Patch to make this package work on requests >= 2.11.x # CAN BE REMOVED ON NEXT PACKAGE UPDATE sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/network/networkresourceprovider.py ''; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; propagatedBuildInputs = [ azure-mgmt-common ]; meta = with pkgs.lib; { description = "Microsoft Azure SDK for Python"; homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; maintainers = with maintainers; [ olcai ]; }; } </del>
<del> { pkgs , buildPythonPackage , fetchPypi , azure-nspkg }: buildPythonPackage rec { version = "1.0.0"; pname = "azure-mgmt-nspkg"; src = fetchPypi { inherit pname version; extension = "zip"; sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq"; }; propagatedBuildInputs = [ azure-nspkg ]; meta = with pkgs.lib; { description = "Microsoft Azure SDK for Python"; homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; maintainers = with maintainers; [ olcai ]; }; } </del>
<del> { pkgs , buildPythonPackage , fetchPypi , python , azure-mgmt-common }: buildPythonPackage rec { version = "0.20.1"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml"; }; preConfigure = '' # Patch to make this package work on requests >= 2.11.x # CAN BE REMOVED ON NEXT PACKAGE UPDATE sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/resource/resourcemanagement.py ''; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; propagatedBuildInputs = [ azure-mgmt-common ]; meta = with pkgs.lib; { description = "Microsoft Azure SDK for Python"; homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; maintainers = with maintainers; [ olcai ]; }; } </del>
<del> { pkgs , buildPythonPackage , fetchPypi , python , azure-mgmt-common }: buildPythonPackage rec { version = "0.20.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim"; }; preConfigure = '' # Patch to make this package work on requests >= 2.11.x # CAN BE REMOVED ON NEXT PACKAGE UPDATE sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py ''; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py ''; propagatedBuildInputs = [ azure-mgmt-common ]; meta = with pkgs.lib; { description = "Microsoft Azure SDK for Python"; homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; maintainers = with maintainers; [ olcai ]; }; } </del>
<del> { pkgs , buildPythonPackage , fetchPypi , python , azure-common , futures , python-dateutil , requests , isPy3k }: buildPythonPackage rec { version = "0.20.3"; pname = "azure-storage"; src = fetchPypi { inherit pname version; extension = "zip"; sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb"; }; propagatedBuildInputs = [ azure-common python-dateutil requests ] ++ pkgs.lib.optionals (!isPy3k) [ futures ]; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py ''; meta = with pkgs.lib; { description = "Microsoft Azure SDK for Python"; homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.asl20; maintainers = with maintainers; [ olcai ]; }; } </del>
enable = mkEnableOption "Plymouth boot splash screen"; <ins> font = mkOption { default = "${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf"; type = types.path; description = '' Font file made available for displaying text on the splash screen. ''; }; </ins> themePackages = mkOption { default = [ nixosBreezePlymouth ]; type = types.listOf types.package;
mkdir -p $out/lib/plymouth/renderers # module might come from a theme <del> cp ${themesEnv}/lib/plymouth/{text,details,$moduleName}.so $out/lib/plymouth </del> <ins> cp ${themesEnv}/lib/plymouth/{text,details,label,$moduleName}.so $out/lib/plymouth </ins> cp ${plymouth}/lib/plymouth/renderers/{drm,frame-buffer}.so $out/lib/plymouth/renderers mkdir -p $out/share/plymouth/themes
cp -r themes/* $out/share/plymouth/themes cp ${cfg.logo} $out/share/plymouth/logo.png <ins> mkdir -p $out/share/fonts cp ${cfg.font} $out/share/fonts mkdir -p $out/etc/fonts cat > $out/etc/fonts/fonts.conf <<EOF <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> <dir>$out/share/fonts</dir> </fontconfig> EOF </ins> ''; boot.initrd.extraUtilsCommandsTest = ''
ln -s $extraUtils/share/plymouth/logo.png /etc/plymouth/logo.png ln -s $extraUtils/share/plymouth/themes /etc/plymouth/themes ln -s $extraUtils/lib/plymouth /etc/plymouth/plugins <ins> ln -s $extraUtils/etc/fonts /etc/fonts </ins> plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session plymouth show-splash
export CARGO_PKG_VERSION_MAJOR=${builtins.elemAt version 0} export CARGO_PKG_VERSION_MINOR=${builtins.elemAt version 1} export CARGO_PKG_VERSION_PATCH=${builtins.elemAt version 2} <ins> export CARGO_PKG_VERSION_PRE="${versionPre}" export CARGO_PKG_HOMEPAGE="${crateHomepage}" </ins> export NUM_JOBS=1 export RUSTC="rustc" export RUSTDOC="rustdoc" <del> if [[ -n "${versionPre}" ]]; then export CARGO_PKG_VERSION_PRE="${versionPre}" fi </del> BUILD="" if [[ ! -z "${build}" ]] ; then
crateVersion = crate.version; crateDescription = crate.description or ""; crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else []; <ins> crateHomepage = crate.homepage or ""; </ins> crateType = if lib.attrByPath ["procMacro"] false crate then ["proc-macro"] else if lib.attrByPath ["plugin"] false crate then ["dylib"] else
sha256 = "bda0ef48e6a44c091399b12ab4a7e580d2dd8294c222b301f88d7d57f47ba142"; }; <ins> patches = [ # Fix tests for pytest>=4.2.0. Remove with the next release (fetchpatch { url = "https://github.com/RKrahl/pytest-dependency/commit/089395bf77e629ee789666361ee12395d840252c.patch"; sha256 = "1nkha2gndrr3mx11kx2ipxhphqd6wr25hvkrfwzyrispqfhgl0wm"; excludes = [ "doc/src/changelog.rst" ]; }) ]; </ins> propagatedBuildInputs = [ pytest ]; <ins> checkInputs = [ pytest ]; </ins> checkPhase = '' pytest '';
"--enable-fixed-path=${gnupg}/bin" "--with-libgpg-error-prefix=${libgpgerror.dev}" "--with-libassuan-prefix=${libassuan.dev}" <del> ] ++ lib.optional pythonSupport "--enable-languages=python"; </del> <ins> ] ++ lib.optional pythonSupport "--enable-languages=python" # Tests will try to communicate with gpg-agent instance via a UNIX socket # which has a path length limit. Nix on darwin is using a build directory # that already has quite a long path and the resulting socket path doesn't # fit in the limit. https://github.com/NixOS/nix/pull/1085 ++ lib.optionals stdenv.isDarwin [ "--disable-gpg-test" ]; </ins> NIX_CFLAGS_COMPILE = # qgpgme uses Q_ASSERT which retains build inputs at runtime unless
# raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { # Upstream uploaded a -1 tarball on the same release, remove on next release <del> url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}-1.tar.bz2"; </del> <ins> url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}-1.tar.bz2"; </ins> hash = "sha256-d0EWXW1lLqe0oehJjPQ5pWuBpcyLZTKRpZBU8jYqv8w="; };
enableParallelChecking = true; checkTarget = "check"; <ins> passthru.docs = stdenv.mkDerivation { pname = "gnucash-docs"; inherit version; src = fetchFromGitHub { owner = "Gnucash"; repo = "gnucash-docs"; rev = version; hash = "sha256-aPxQEcpo8SPv8lPQbxMl1wg8ijH9Rz0oo4K5lp3C/bw="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ libxml2 libxslt ]; }; </ins> preFixup = '' gappsWrapperArgs+=( <ins> # documentation --prefix XDG_DATA_DIRS : ${passthru.docs}/share </ins> # db drivers location --set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd # gsettings schema location on Nix <del> --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "${pname}-${version}"} </del> <ins> --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "gnucash-${version}"} </ins> ) '';
sha256 = "1z66m16n4r16zqmnv84a5jndr5x6mdqdq4b1wq929sablwqd2rl4"; }; <del> cargoSha256 = "1xdx0gjqd4zyhnp72hz88rdmgry1m7rcw2j73lh67vp08z74y54y"; </del> <ins> cargoSha256 = "0hp68w5mvk725gzbmlgl8j6wa1dv2fydil7jvq0f09mzxxaqrwcs"; </ins> nativeBuildInputs = [ pkgconfig ];
<ins> --- crypto++/GNUmakefile 2013-02-20 10:30:52.000000000 -0500 +++ crypto++/GNUmakefile 2015-05-07 18:34:25.000000000 -0500 @@ -87,8 +87,8 @@ endif ifeq ($(UNAME),Darwin) -AR = libtool -ARFLAGS = -static -o +AR = ar +ARFLAGS = cru CXX = c++ IS_GCC2 = $(shell $(CXX) -v 2>&1 | $(EGREP) -c gcc-932) ifeq ($(IS_GCC2),1) </ins>
sha256 = "0x1mqpz1v071cfrw4grbw7z734cxnpry1qh2b6rsmcx6nkyd5gsw"; }; <del> patches = stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch; </del> <ins> patches = (stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch) ++ (stdenv.lib.optional stdenv.isDarwin ./GNUmakefile.patch); </ins> buildInputs = [ unzip libtool ];
substituteInPlace ddclient  --replace 'in the output of ifconfig' 'in the output of ip addr show'  --replace 'ifconfig -a'               '${iproute}/sbin/ip addr show'  <del> --replace 'ifconfig $arg'             '${iproute}/sbin/ip addr show $arg' </del> <ins> --replace 'ifconfig $arg'             '${iproute}/sbin/ip addr show $arg'  # Until we get the patchShebangs fixed (issue #55786) we need to patch this manually --replace '/usr/bin/perl'		    '${perl}/bin/perl' </ins> ''; installPhase = ''
''; }; <ins> generatePeerUnit = { interfaceName, interfaceCfg, peer }: let keyToUnitName = replaceChars [ "/" "-"    " "     "+"     "="      ] [ "-" "x2d" "x20" "x2b" "x3d" ]; unitName = keyToUnitName peer.publicKey; psk = if peer.presharedKey != null then pkgs.writeText "wg-psk" peer.presharedKey else peer.presharedKeyFile; in nameValuePair "wireguard-${interfaceName}-peer-${unitName}" { description = "WireGuard Peer - ${interfaceName} - ${peer.publicKey}"; requires = [ "wireguard-${interfaceName}.service" ]; after = [ "wireguard-${interfaceName}.service" ]; wantedBy = [ "multi-user.target" ]; environment.DEVICE = interfaceName; environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity"; path = with pkgs; [ iproute wireguard-tools ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; }; script = let wg_setup = "wg set ${interfaceName} peer ${peer.publicKey}" + optionalString (psk != null) " preshared-key ${psk}" + optionalString (peer.endpoint != null) " endpoint ${peer.endpoint}" + optionalString (peer.persistentKeepalive != null) " persistent-keepalive ${toString peer.persistentKeepalive}" + optionalString (peer.allowedIPs != []) " allowed-ips ${concatStringsSep "," peer.allowedIPs}"; route_setup = optionalString (interfaceCfg.allowedIPsAsRoutes != false) (concatMapStringsSep "n" (allowedIP: "ip route replace ${allowedIP} dev ${interfaceName} table ${interfaceCfg.table}" ) peer.allowedIPs); in '' ${wg_setup} ${route_setup} ''; </ins> <del> generateSetupServiceUnit = name: values: </del> <ins> postStop = let route_destroy = optionalString (interfaceCfg.allowedIPsAsRoutes != false) (concatMapStringsSep "n" (allowedIP: "ip route delete ${allowedIP} dev ${interfaceName} table ${interfaceCfg.table}" ) peer.allowedIPs); in '' wg set ${interfaceName} peer ${peer.publicKey} remove ${route_destroy} ''; }; generateInterfaceUnit = name: values: </ins> # exactly one way to specify the private key must be set #assert (values.privateKey != null) != (values.privateKeyFile != null); let privKey = if values.privateKeyFile != null then values.privateKeyFile else pkgs.writeText "wg-key" values.privateKey;
wg set ${name} private-key ${privKey} ${ optionalString (values.listenPort != null) " listen-port ${toString values.listenPort}"} <del> ${concatMapStringsSep "n" (peer: assert (peer.presharedKeyFile == null) || (peer.presharedKey == null); # at most one of the two must be set let psk = if peer.presharedKey != null then pkgs.writeText "wg-psk" peer.presharedKey else peer.presharedKeyFile; in "wg set ${name} peer ${peer.publicKey}" + optionalString (psk != null) " preshared-key ${psk}" + optionalString (peer.endpoint != null) " endpoint ${peer.endpoint}" + optionalString (peer.persistentKeepalive != null) " persistent-keepalive ${toString peer.persistentKeepalive}" + optionalString (peer.allowedIPs != []) " allowed-ips ${concatStringsSep "," peer.allowedIPs}" ) values.peers} </del> ip link set up dev ${name} <del> ${optionalString (values.allowedIPsAsRoutes != false) (concatStringsSep "n" (concatMap (peer: (map (allowedIP: "ip route replace ${allowedIP} dev ${name} table ${values.table}" ) peer.allowedIPs) ) values.peers))} </del> ${values.postSetup} '';
###### implementation <del> config = mkIf cfg.enable { </del> <ins> config = mkIf cfg.enable (let all_peers = flatten (mapAttrsToList (interfaceName: interfaceCfg: map (peer: { inherit interfaceName interfaceCfg peer;}) interfaceCfg.peers ) cfg.interfaces); in { </ins> assertions = (attrValues ( mapAttrs (name: value: {
mapAttrs (name: value: { assertion = value.generatePrivateKeyFile -> (value.privateKey == null); message = "networking.wireguard.interfaces.${name}.generatePrivateKey must not be set if networking.wireguard.interfaces.${name}.privateKey is set."; <del> }) cfg.interfaces)); </del> <ins> }) cfg.interfaces)) ++ map ({ interfaceName, peer, ... }: { assertion = (peer.presharedKey == null) || (peer.presharedKeyFile == null); message = "networking.wireguard.interfaces.${interfaceName} peer «${peer.publicKey}» has both presharedKey and presharedKeyFile set, but only one can be used."; }) all_peers; </ins> boot.extraModulePackages = [ kernel.wireguard ]; environment.systemPackages = [ pkgs.wireguard-tools ]; <del> systemd.services = (mapAttrs' generateSetupServiceUnit cfg.interfaces) </del> <ins> systemd.services = (mapAttrs' generateInterfaceUnit cfg.interfaces) // (listToAttrs (map generatePeerUnit all_peers)) </ins> // (mapAttrs' generateKeyServiceUnit (filterAttrs (name: value: value.generatePrivateKeyFile) cfg.interfaces)); systemd.paths = mapAttrs' generatePathUnit (filterAttrs (name: value: value.privateKeyFile != null) cfg.interfaces); <del> }; </del> <ins> }); </ins> }
stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; <del> version = "0.0.20190406"; </del> <ins> version = "0.0.20190531"; </ins> src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; <del> sha256 = "1rqyyyx7j41vpp4jigagqs2qdyfngh15y48ghdqfrkv7v93vwdak"; </del> <ins> sha256 = "0caw6kc0lqsvzvdjpdbdn3r9ff93vdl46616pwlig0rsdjrqnklj"; </ins> }; sourceRoot = "source/src/tools";
{ stdenv, lib, fetchurl, fetchzip, python3Packages <del> , makeWrapper, wrapGAppsHook, qtbase, glib-networking </del> <ins> , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking </ins> , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null , withPdfReader        ? true
let pdfjs = let <del> version = "1.10.100"; </del> <ins> version = "2.1.266"; </ins> in fetchzip rec { name = "pdfjs-${version}"; url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; <del> sha256 = "04df4cf6i6chnggfjn6m1z9vb89f01a0l9fj5rk21yr9iirq9rkq"; </del> <ins> sha256 = "1ybbnpz2jcdikzwr7r13lq528vxj3bpms1fqmg3n1zgs30cqpkby"; </ins> stripRoot = false; }; <del> in python3Packages.buildPythonApplication rec { </del> <ins> in mkDerivationWith python3Packages.buildPythonApplication rec { </ins> pname = "qutebrowser"; <del> version = "1.6.3"; </del> <ins> version = "1.7.0"; </ins> # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; <del> sha256 = "0z9an14vlv0r48x7fk0mk7465gnhh19dx1w63lyhsgnfqy5pzlhy"; </del> <ins> sha256 = "0wyjmb2qvnw3gn0ypgckwblmn7kasi12dfwp343hi6wscqripw7i"; </ins> }; # Needs tox
postInstall = '' install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1" <del> install -Dm644 misc/qutebrowser.desktop  "$out/share/applications/qutebrowser.desktop" </del> <ins> install -Dm644 misc/org.qutebrowser.qutebrowser.desktop  "$out/share/applications/org.qutebrowser.qutebrowser.desktop" </ins> # Install icons for i in 16 24 32 48 64 128 256 512; do
stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "clingo"; <del> version = "5.2.2"; </del> <ins> version = "5.3.0"; </ins> src = fetchzip { url = "https://github.com/potassco/clingo/archive/v${version}.tar.gz"; <del> sha256 = "04rjwpna37gzm8vxr09z3z6ay8y8cxbjd8lga7xvqfpn2l178zjm"; </del> <ins> sha256 = "01czx26p8gv81ahrh650x208hjhd8bx1kb688fmk1m4pw4yg5bfv"; </ins> }; buildInputs = [];
{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { <del> version = "1.19.1"; </del> <ins> version = "1.22.0"; </ins> name = "grpc-${version}"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; <del> sha256 = "0c0jra4qnd86gyr4rlblic3igb5dpgrldac35myk5i5ia547fdhj"; </del> <ins> sha256 = "10wf9sakkxpcvc09n1h91x6slwwhxblghs4zn95klyc4m6py1gfg"; </ins> }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
<del> { stdenv, buildPythonPackage, fetchPypi, lib, grpcio}: </del> <ins> { stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio }: </ins> buildPythonPackage rec { pname = "grpcio-tools"; <del> version = "1.18.0"; </del> <ins> version = "1.22.0"; </ins> src = fetchPypi { inherit pname version; <del> sha256 = "77ec4d3c92ccbbe3de37c457e3c72962e519c36cafb96abe5842bced8eb926fa"; </del> <ins> sha256 = "b5c0fe51a155625c9d1132ab8deb56b3015e111a6961e48aeb9dd89bd7c670ab"; </ins> }; enableParallelBuilding = true; <del> propagatedBuildInputs = [ grpcio ]; </del> <ins> propagatedBuildInputs = [ protobuf grpcio ]; </ins> # no tests in the package doCheck = false; meta = with stdenv.lib; { description = "Protobuf code generator for gRPC"; <del> license = lib.licenses.asl20; </del> <ins> license = licenses.asl20; </ins> homepage = "https://grpc.io/grpc/python/"; maintainers = with maintainers; [ vanschelven ]; };
<del> { stdenv, buildPythonPackage, fetchFromGitHub, lib, darwin , six, protobuf, enum34, futures, isPy27, isPy34, pkgconfig </del> <ins> { stdenv, buildPythonPackage, fetchFromGitHub, darwin , six, protobuf, enum34, futures, isPy27, pkgconfig </ins> , cython}: <del> with stdenv.lib; </del> buildPythonPackage rec { pname = "grpcio"; <del> version = "1.18.0"; </del> <ins> version = "1.22.0"; </ins> src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; fetchSubmodules = true; <del> sha256 = "0cilbhk35gv46mk40jl5f3iqa94x14qyxbavpfq0kh0rld82nx4m"; </del> <ins> sha256 = "093w8mgvl8ylqlqnfz06ijkmlnkxcjszf9zg6k5ybjw7dwal0jhz"; </ins> }; nativeBuildInputs = [ cython pkgconfig ] <del> ++ optional stdenv.isDarwin darwin.cctools; </del> <ins> ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; </ins> propagatedBuildInputs = [ six protobuf ] <del> ++ lib.optionals (isPy27 || isPy34) [ enum34 ] ++ lib.optionals (isPy27) [ futures ]; </del> <ins> ++ stdenv.lib.optionals (isPy27) [ enum34 futures ]; </ins> <del> preBuild = optionalString stdenv.isDarwin "unset AR"; </del> <ins> preBuild = stdenv.lib.optionalString stdenv.isDarwin "unset AR"; </ins> meta = with stdenv.lib; { description = "HTTP/2-based RPC framework"; <del> license = lib.licenses.asl20; </del> <ins> license = licenses.asl20; </ins> homepage = "https://grpc.io/grpc/python/"; maintainers = with maintainers; [ vanschelven ]; };
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" ''; <ins> patches = [ (fetchpatch { url = "https://github.com/opencv/opencv/commit/5691d998ead1d9b0542bcfced36c2dceb3a59023.patch"; name = "CVE-2019-14493.patch"; sha256 = "14qva9f5z10apz5q0skdyiclr9sgkhab4fzksy1w3b6j6hg4wm7m"; }) ]; </ins> # This prevents cmake from using libraries in impure paths (which # causes build failure on non NixOS) # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
<ins> { stdenv , cmake , fetchFromGitHub , wrapQtAppsHook , qtmultimedia , qttools , qtscript , qtdeclarative , qtbase , autogen , automake , makeWrapper , catch2 , nodejs , libpulseaudio , openssl , rsync , typescript }: stdenv.mkDerivation rec { name = "imgbrd-grabber"; version = "7.3.2"; src = fetchFromGitHub { owner = "Bionus"; repo = "imgbrd-grabber"; rev = "v${version}"; sha256 = "053rwvcr88fcba0447a6r115cgnqsm9rl066z8d5jacqnhdij58k"; fetchSubmodules = true; }; buildInputs = [ openssl makeWrapper libpulseaudio typescript ]; nativeBuildInputs = [ qtmultimedia qtbase qtdeclarative qttools nodejs cmake wrapQtAppsHook ]; extraOutputsToLink = [ "doc" ]; postPatch = '' # the package.sh script provides some install helpers # using this might make it easier to maintain/less likely for the # install phase to fail across version bumps patchShebangs ./scripts/package.sh # ensure the script uses the rsync package from nixpkgs substituteInPlace ../scripts/package.sh --replace "rsync" "${rsync}/bin/rsync" # the npm build step only runs typescript # run this step directly so it doesn't try and fail to download the unnecessary node_modules, etc. substituteInPlace ./sites/CMakeLists.txt --replace "npm install" "npm run build" # remove the vendored catch2 rm -rf tests/src/vendor/catch # link the catch2 sources from nixpkgs ln -sf ${catch2.src} tests/src/vendor/catch ''; postInstall = '' # move the binaries to the share/Grabber folder so # some relative links can be resolved (e.g. settings.ini) mv $out/bin/* $out/share/Grabber/ cd ../.. # run the package.sh with $out/share/Grabber as the $APP_DIR sh ./scripts/package.sh $out/share/Grabber # add symlinks for the binaries to $out/bin ln -s $out/share/Grabber/Grabber $out/bin/Grabber ln -s $out/share/Grabber/Grabber-cli $out/bin/Grabber-cli ''; sourceRoot = "source/src"; } </ins>
img2pdf = with python3Packages; toPythonApplication img2pdf; <ins> imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber/default.nix { typescript = nodePackages.typescript; }; </ins> imgcat = callPackage ../applications/graphics/imgcat { }; imgp = python3Packages.callPackage ../applications/graphics/imgp { };