diff options
| -rw-r--r-- | pkgs/applications/audio/lsp-plugins/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/tools/skaffold/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/package-management/home-manager/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/static.nix | 7 |
6 files changed, 21 insertions, 12 deletions
diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index b146fcecc8ec..8a2f64b4efd4 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.1.13"; + version = "1.1.15"; src = fetchFromGitHub { owner = "sadko4u"; repo = pname; rev = "${pname}-${version}"; - sha256 = "00mhrr873kgcnqy3q0yi1r5zacfcvz7fqpzsmfhw5d095jm970al"; + sha256 = "0lynyjs5zp27gnzcv8a23pvb7c1ghzc2dspypca3ciq40bfpfzik"; }; nativeBuildInputs = [ pkgconfig php makeWrapper ]; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder ''out''}" + "ETC_PATH=$(out)/etc" ]; NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL"; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index b778b62f908d..23a3d5d84099 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -28,6 +28,7 @@ , stripTkinter ? false , rebuildBytecode ? true , stripBytecode ? false +, static ? false }: assert x11Support -> tcl != null @@ -130,7 +131,7 @@ in with passthru; stdenv.mkDerivation { CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs); LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs); LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"; - NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; + NIX_LDFLAGS = optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "-lgcc_s" + optionalString stdenv.hostPlatform.isMusl "-lgcc_eh"; # Determinism: We fix the hashes of str, bytes and datetime objects. PYTHONHASHSEED=0; @@ -169,7 +170,7 @@ in with passthru; stdenv.mkDerivation { # Never even try to use lchmod on linux, # don't rely on detecting glibc-isms. "ac_cv_func_lchmod=no" - ]; + ] ++ optional static "LDFLAGS=-static"; preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity @@ -262,7 +263,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 = - stdenv.lib.optionals (openssl != null) [ openssl.dev ] + stdenv.lib.optionals (openssl != null && !static) [ openssl.dev ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Ensure we don't have references to build-time packages. # These typically end up in shebangs. diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index bab881cf4a49..d1d1200344f8 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.4.0"; + version = "1.6.0"; # rev is the ${version} commit, mainly for skaffold version command output - rev = "bb324609b4254ceb9f76d35eb03642a6a1807867"; + rev = "4cc0be23e41e37d8b1bca1464516538b2cc1bba0"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0nrz2gnp722cq4p8lcfl0nlws53c2bfq17jgr2jad4vyjglgfscw"; + sha256 = "0wz9x3p0hfajrkm1qrhl4kw7l7r3n6xv16chl4dxigaix8ga068h"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 49909510d2ed..1a98af055878 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -17,7 +17,7 @@ , airtunesSupport ? false -, bluetoothSupport ? false +, bluetoothSupport ? true , remoteControlSupport ? false diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 793c7cfae32d..8c70a5a47242 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "home-manager"; - version = "2020-03-07"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "rycee"; repo = "home-manager"; - rev = "5c1e7349bbd9b51fe41ea96b67c380feef996b90"; - sha256 = "03lw5pq878zbkkwm5abr01p77radn2zgfyvwlra7fhywbl76l83x"; + rev = "5969551a5cc52f9470b5ff5ca01327bf4bda82c1"; + sha256 = "0f4kz83a1kp3ci8zi5hvp8fp34wi73arpykl4d9vlywdk6w36bnd"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 0de1db7d99b3..c7db64b99f6f 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -266,6 +266,13 @@ in { ) super.ocaml-ng; python27 = super.python27.override { static = true; }; + python35 = super.python35.override { static = true; }; + python36 = super.python36.override { static = true; }; + python37 = super.python37.override { static = true; }; + python38 = super.python38.override { static = true; }; + python39 = super.python39.override { static = true; }; + python3Minimal = super.python3Minimal.override { static = true; }; + libev = super.libev.override { static = true; }; } |