Unverified Commit dcede105 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #200868: staging-next 2022-11-12

parents fe95dfad eb29401d

pkgs/applications/terminal-emulators/xterm/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ 


stdenv.mkDerivation rec {

  pname = "xterm";

  version = "374";

  version = "375";



  src = fetchurl {

    urls = [

      "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"

      "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"

    ];

    sha256 = "sha256-EdTWJmcNTW17aft0Z+nsIxgX5a0iUC+RZ3aP2IrBvfU=";

    sha256 = "sha256-MCxZor+B55xqcBUl13gWGiGNEjnyFWjYnivdMcAVIX8=";

  };



  strictDeps = true;

pkgs/applications/window-managers/i3/i3ipc-glib.nix

+3 −4
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
}:



stdenv.mkDerivation rec {



  pname = "i3ipc-glib";

  version = "1.0.1";
@@ -15,10 +14,10 @@ stdenv.mkDerivation rec { 
    sha256 = "01fzvrbnzcwx0vxw29igfpza9zwzp2s7msmzb92v01z0rz0y5m0p";

  };



  nativeBuildInputs = [ autoreconfHook which pkg-config ];



  buildInputs = [ libxcb json-glib gtk-doc xorgproto gobject-introspection ];

  strictDeps = true;

  nativeBuildInputs = [ autoreconfHook which pkg-config gtk-doc gobject-introspection ];



  buildInputs = [ libxcb json-glib xorgproto ];



  preAutoreconf = ''

    gtkdocize

pkgs/development/compilers/llvm/11/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ let 
      mkdir "$rsrc"

      ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc"

      echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags

      echo "-B $rsrc/lib" >> $out/nix-support/cc-cflags

    '';

    mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + ''

      ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"

pkgs/development/interpreters/python/cpython/default.nix

+4 −9
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
, mailcap, mimetypesSupport ? true

, ncurses

, openssl

, openssl_1_1

, readline

, sqlite

, tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false
@@ -77,10 +76,6 @@ assert lib.assertMsg (reproducibleBuild -> (!rebuildBytecode)) 
with lib;



let

  # cpython does support/build with openssl 3.0, but some libraries using the ssl module seem to have issues with it

  # null check for Minimal

  openssl' = if openssl != null then openssl_1_1 else null;



  buildPackages = pkgsBuildHost;

  inherit (passthru) pythonForBuild;
@@ -121,7 +116,7 @@ let 
  ];



  buildInputs = filter (p: p != null) ([

    zlib bzip2 expat xz libffi gdbm sqlite readline ncurses openssl' ]

    zlib bzip2 expat xz libffi gdbm sqlite readline ncurses openssl ]

    ++ optionals x11Support [ tcl tk libX11 xorgproto ]

    ++ optionals (bluezSupport && stdenv.isLinux) [ bluez ]

    ++ optionals stdenv.isDarwin [ configd ])
@@ -327,8 +322,8 @@ in with passthru; stdenv.mkDerivation { 
    "--with-threads"

  ] ++ optionals (sqlite != null && isPy3k) [

    "--enable-loadable-sqlite-extensions"

  ] ++ optionals (openssl' != null) [

    "--with-openssl=${openssl'.dev}"

  ] ++ optionals (openssl != null) [

    "--with-openssl=${openssl.dev}"

  ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

    "ac_cv_buggy_getaddrinfo=no"

    # Assume little-endian IEEE 754 floating point when cross compiling
@@ -493,7 +488,7 @@ in with passthru; stdenv.mkDerivation { 
  # Enforce that we don't have references to the OpenSSL -dev package, which we

  # explicitly specify in our configure flags above.

  disallowedReferences =

    lib.optionals (openssl' != null && !static) [ openssl'.dev ]

    lib.optionals (openssl != null && !static) [ openssl.dev ]

    ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

    # Ensure we don't have references to build-time packages.

    # These typically end up in shebangs.

pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh

+15 −1
Original line number Diff line number Diff line
@@ -3,7 +3,21 @@ echo "Sourcing python-catch-conflicts-hook.sh" 


pythonOutputDistPhase() {

    echo "Executing pythonOutputDistPhase"

    if [[ -d dist ]]; then

        mv "dist" "$dist"

    else

        cat >&2 <<EOF

The build contains no ./dist directory.

If this project is not setuptools-based, pass



  format = "other";



to buildPythonApplication/buildPythonPackage or another appropriate value as described here:



  https://nixos.org/manual/nixpkgs/stable/#buildpythonpackage-function

EOF

        false

    fi

    echo "Finished executing pythonOutputDistPhase"

}