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

staging-next 2024-10-15 (#348827)

parents 0232b1d3 ce8b620b

.github/CODEOWNERS

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
# Use ci/OWNERS instead

#

# This file would be for the native code owner feature of GitHub,

# but is not being used because of its problems, see ci/OWNERS

ci/OWNERS

+6 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
/pkgs/build-support/bintools-wrapper             @Ericson2314

/pkgs/build-support/setup-hooks                  @Ericson2314

/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus

/pkgs/build-support/setup-hooks/auto-patchelf.py @layus

/pkgs/by-name/au/auto-patchelf                   @layus

/pkgs/pkgs-lib                                   @infinisil

## Format generators/serializers

/pkgs/pkgs-lib/formats/libconfig                 @h7x4
@@ -415,3 +415,8 @@ pkgs/by-name/lx/lxc* @adamcstephens 
/pkgs/by-name/in/installShellFiles/*     @Ericson2314

/pkgs/test/install-shell-files/*         @Ericson2314

/doc/hooks/installShellFiles.section.md  @Ericson2314



# Darwin

/pkgs/by-name/ap/apple-sdk                     @NixOS/darwin-core

/pkgs/os-specific/darwin/apple-source-releases @NixOS/darwin-core

/pkgs/stdenv/darwin                            @NixOS/darwin-core

doc/hooks/tauri.section.md

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases. 
  npmHooks,

  openssl,

  pkg-config,

  webkitgtk,

  webkitgtk_4_0,

  wrapGAppsHook3,

}:
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { 
    ++ lib.optionals stdenv.isLinux [

      glib-networking # Most Tauri apps need networking

      libsoup

      webkitgtk

      webkitgtk_4_0

    ]

    ++ lib.optionals stdenv.isDarwin (

      with darwin.apple_sdk.frameworks;

doc/languages-frameworks/haskell.section.md

+1 −1
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ that depend on that library, you may want to use: 


```nix

haskellPackages.haskell-ci.overrideScope (self: super: {

  Cabal = self.Cabal_3_6_2_0;

  Cabal = self.Cabal_3_14_0_0;

})

```

doc/languages-frameworks/rust.section.md

+2 −2
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ Some projects, especially GNOME applications, are built with the Meson Build Sys 
, blueprint-compiler

, libadwaita

, libsecret

, tracker

, tinysparql

}:



stdenv.mkDerivation rec {
@@ -712,7 +712,7 @@ stdenv.mkDerivation rec { 
  buildInputs = [

    libadwaita

    libsecret

    tracker

    tinysparql

  ];



  # ...