public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
This commit is contained in:
obadz
2016-08-27 23:54:54 +01:00
parent 132571454c df27c35e9a
commit 3de6e5be50
209 changed files with 5290 additions and 5482 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/drivers/foo2zjs/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, foomatic_filters, bc, unzip, ghostscript, systemd, vim }:
{ stdenv, fetchurl, foomatic-filters, bc, unzip, ghostscript, systemd, vim }:
stdenv.mkDerivation rec {
name = "foo2zjs-20110210";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0vss8gdbbgxr694xw48rys2qflbnb4sp4gdb1v6z4m9ab97hs5yk";
};
buildInputs = [ foomatic_filters bc unzip ghostscript systemd vim ];
buildInputs = [ foomatic-filters bc unzip ghostscript systemd vim ];
patches = [ ./no-hardcode-fw.diff ];