Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0256080d11b5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e6167ceaa274
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 16, 2019

  1. sane-backends: remove /etc/sane.d/net.conf

    @multun
    multun committed Oct 16, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ec2a8d2 View commit details

Commits on Oct 17, 2019

  1. Merge pull request #71237 from multun/sane_net.conf_conflict 

    sane-backends: remove $out/etc/sane.d/net.conf
    @peti
    peti authored Oct 17, 2019
    Copy the full SHA
    e6167ce View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 pkgs/applications/graphics/sane/backends/generic.nix
3 changes: 3 additions & 0 deletions pkgs/applications/graphics/sane/backends/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -57,6 +57,9 @@ stdenv.mkDerivation {
substituteInPlace $out/lib/libsane.la \
--replace "-ljpeg" "-L${libjpeg.out}/lib -ljpeg"
# net.conf conflicts with the file generated by the nixos module
rm -f $out/etc/sane.d/net.conf
'' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware);

meta = with stdenv.lib; {