Unverified Commit fc27cc55 authored by Rahul Mishra's avatar Rahul Mishra Committed by GitHub
Browse files

Merge branch 'NixOS:master' into vscode-runtime-libsecret

parents ed2f5f18 cd6d4800

.github/CODEOWNERS

+5 −3
Original line number Diff line number Diff line
@@ -58,9 +58,11 @@ 
/maintainers/scripts/db-to-md.sh @jtojnar @ryantm

/maintainers/scripts/doc @jtojnar @ryantm



/doc/build-aux/pandoc-filters @jtojnar

/doc/contributing/ @fricklerhandwerk

/doc/contributing/contributing-to-documentation.chapter.md @jtojnar @fricklerhandwerk

# Contributor documentation

/CONTRIBUTING.md @infinisil

/.github/PULL_REQUEST_TEMPLATE.md @infinisil

/doc/contributing/ @fricklerhandwerk @infinisil

/doc/contributing/contributing-to-documentation.chapter.md @jtojnar @fricklerhandwerk @infinisil



# NixOS Internals

/nixos/default.nix                                    @infinisil

pkgs/applications/networking/remote/remmina/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: { 


  preFixup = ''

    gappsWrapperArgs+=(

      --set-default SSL_CERT_DIR "/etc/ssl/certs/"

      --prefix LD_LIBRARY_PATH : "${libX11.out}/lib"

      ${lib.optionalString stdenv.isDarwin ''

        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"

pkgs/applications/video/mpv/scripts/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ lib.recurseIntoAttrs 
    thumbfast = callPackage ./thumbfast.nix { };

    thumbnail = callPackage ./thumbnail.nix { };

    uosc = callPackage ./uosc.nix { };

    visualizer = callPackage ./visualizer.nix { };

    vr-reversal = callPackage ./vr-reversal.nix { };

    webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { };

    cutter = callPackage ./cutter.nix { };

pkgs/applications/video/mpv/scripts/visualizer.nix

0 → 100644
+34 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenvNoCC,

  fetchFromGitHub,

}:

stdenvNoCC.mkDerivation {

  pname = "visualizer";

  version = "unstable-2021-07-10";



  src = fetchFromGitHub {

    owner = "mfcc64";

    repo = "mpv-scripts";

    rev = "a0cd87eeb974a4602c5d8086b4051b5ab72f42e1";

    sha256 = "1xgd1nd117lpj3ppynhgaa5sbkfm7l8n6c9a2fy8p07is2dkndrq";

  };



  dontBuild = true;



  installPhase = ''

    runHook preInstall

    mkdir -p $out/share/mpv/scripts

    cp visualizer.lua $out/share/mpv/scripts

    runHook postInstall

  '';



  passthru.scriptName = "visualizer.lua";



  meta = with lib; {

    description = "various audio visualization";

    homepage = "https://github.com/mfcc64/mpv-scripts";

    platforms = platforms.all;

    maintainers = with maintainers; [kmein];

  };

}

pkgs/development/tools/language-servers/nil/default.nix

+7 −7
Original line number Diff line number Diff line 
{ lib, rustPlatform, fetchFromGitHub, nix, nix-update-script }:

{ lib, rustPlatform, fetchFromGitHub, nixVersions, nix-update-script }:



rustPlatform.buildRustPackage rec {

  pname = "nil";

  version = "2023-05-09";

  version = "2023-08-09";



  src = fetchFromGitHub {

    owner = "oxalica";

    repo = pname;

    rev = version;

    hash = "sha256-Xg3Cux5wQDatXRvQWsVD0YPfmxfijjG8+gxYqgoT6JE=";

    hash = "sha256-fZ8KfBMcIFO/R7xaWtB85SFeuUjb9SCH8fxYBnY8068=";

  };



  cargoHash = "sha256-N7flQRIc0CXTuKjy9tVZapu+CXUT4rg66VLLT/vMUoc=";



  CFG_RELEASE = version;

  cargoHash = "sha256-lyKPmzuZB9rCBI9JxhxlyDtNHLia8FXGnSgV+D/dwgo=";



  nativeBuildInputs = [

    (lib.getBin nix)

    (lib.getBin nixVersions.unstable)

  ];



  env.CFG_RELEASE = version;



  # might be related to https://github.com/NixOS/nix/issues/5884

  preBuild = ''

    export NIX_STATE_DIR=$(mktemp -d)