pyrox.dev / nixpkgs
lol
fork atom

Merge staging-next into staging

authored by github-actions[bot] and committed by GitHub 77c79724 456c63eb

+8 -8
unified split
+1 -1
nixos/modules/virtualisation/ec2-metadata-fetcher.nix
··· 71 } 72 73 wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path 74 - wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" 75 wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname 76 wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key 77 ''
··· 71 } 72 73 wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path 74 + (umask 077 && wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data) 75 wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname 76 wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key 77 ''
+1 -1
nixos/modules/virtualisation/openstack-metadata-fetcher.nix
··· 15 } 16 17 wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path 18 - wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" 19 wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname 20 wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key 21 ''
··· 15 } 16 17 wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path 18 + (umask 077 && wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data) 19 wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname 20 wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key 21 ''
+4 -4
pkgs/applications/audio/spotify/default.nix
··· 1 { fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype 2 , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify 3 - , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3 4 , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon 5 }: 6 ··· 29 curl 30 dbus 31 expat 32 - ffmpeg_3 33 fontconfig 34 freetype 35 gdk-pixbuf ··· 127 ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so 128 ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so 129 130 - ln -s ${ffmpeg_3.out}/lib/libavcodec.so* $libdir 131 - ln -s ${ffmpeg_3.out}/lib/libavformat.so* $libdir 132 133 rpath="$out/share/spotify:$libdir" 134
··· 1 { fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype 2 , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify 3 + , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome3 4 , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon 5 }: 6 ··· 29 curl 30 dbus 31 expat 32 + ffmpeg 33 fontconfig 34 freetype 35 gdk-pixbuf ··· 127 ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so 128 ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so 129 130 + ln -s ${ffmpeg.out}/lib/libavcodec.so* $libdir 131 + ln -s ${ffmpeg.out}/lib/libavformat.so* $libdir 132 133 rpath="$out/share/spotify:$libdir" 134
+2 -2
pkgs/development/tools/rust/maturin/default.nix
··· 10 11 rustPlatform.buildRustPackage rec { 12 pname = "maturin"; 13 - version = "0.9.4"; 14 15 src = fetchFromGitHub { 16 owner = "PyO3"; ··· 19 hash = "sha256-9emrBajFd0eLHcsd9Uf6MLCWqZFqxmZdWPBLGIYc2kU="; 20 }; 21 22 - cargoHash = "sha256-poMMEj+zrlU+v5axJbZai2kv36stEKgaciF4zd9A6Qg="; 23 24 nativeBuildInputs = [ pkg-config ]; 25
··· 10 11 rustPlatform.buildRustPackage rec { 12 pname = "maturin"; 13 + version = "0.10.4"; 14 15 src = fetchFromGitHub { 16 owner = "PyO3"; ··· 19 hash = "sha256-9emrBajFd0eLHcsd9Uf6MLCWqZFqxmZdWPBLGIYc2kU="; 20 }; 21 22 + cargoSha256 = "113i7a5hpz7qch45wwapp53ixvgssnlxm0810yjicxp3k61ak30j"; 23 24 nativeBuildInputs = [ pkg-config ]; 25