From 5ea55e4ed02004de54cd7abeaa79a64321940398 Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Sun, 2 May 2021 08:28:59 +1000 Subject: [PATCH 1/3] metadata fetchers: use umask instead of fetch-and-chmod --- nixos/modules/virtualisation/ec2-metadata-fetcher.nix | 2 +- nixos/modules/virtualisation/openstack-metadata-fetcher.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix index dca5c2abd4e..760f024f33f 100644 --- a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix +++ b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix @@ -71,7 +71,7 @@ } wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path - wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" + (umask 077 && wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data) wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key '' diff --git a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix index 8c191397cf9..133cd4c0e9f 100644 --- a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix +++ b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix @@ -15,7 +15,7 @@ } wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path - wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" + (umask 077 && wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data) wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key '' From 2f87975f2d391fc03211157ad04a721084e294fa Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 3 May 2021 17:11:59 -0700 Subject: [PATCH 2/3] maturin: 0.9.4 -> 0.10.4, fix build --- pkgs/development/tools/rust/maturin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 28aeca4a0af..41746fa65ce 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "0.9.4"; + version = "0.10.4"; src = fetchFromGitHub { owner = "PyO3"; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9emrBajFd0eLHcsd9Uf6MLCWqZFqxmZdWPBLGIYc2kU="; }; - cargoHash = "sha256-poMMEj+zrlU+v5axJbZai2kv36stEKgaciF4zd9A6Qg="; + cargoSha256 = "113i7a5hpz7qch45wwapp53ixvgssnlxm0810yjicxp3k61ak30j"; nativeBuildInputs = [ pkg-config ]; From c23146505c35a07bafbecf36af4f9ebde2bb7dfd Mon Sep 17 00:00:00 2001 From: Sheena Artrip Date: Sat, 1 May 2021 20:24:13 -0700 Subject: [PATCH 3/3] spotify: upgrade dependency to ffmpeg4 --- pkgs/applications/audio/spotify/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 3be5af2755b..4014468eafe 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3 +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome3 , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon }: @@ -29,7 +29,7 @@ let curl dbus expat - ffmpeg_3 + ffmpeg fontconfig freetype gdk-pixbuf @@ -127,8 +127,8 @@ stdenv.mkDerivation { ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so - ln -s ${ffmpeg_3.out}/lib/libavcodec.so* $libdir - ln -s ${ffmpeg_3.out}/lib/libavformat.so* $libdir + ln -s ${ffmpeg.out}/lib/libavcodec.so* $libdir + ln -s ${ffmpeg.out}/lib/libavformat.so* $libdir rpath="$out/share/spotify:$libdir"