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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2018-02-24 02:05:30 +02:00
commit ae9d4faff9
31 changed files with 864 additions and 1682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/doc/manual/release-notes/rl-1803.xml
View File

@ -80,6 +80,11 @@ has the following highlights: </para>
following incompatible changes:</para>
<itemizedlist>
<listitem>
<para>
<literal>sound.enable</literal> now defaults to false.
</para>
</listitem>
<listitem>
<para>
Dollar signs in options under <option>services.postfix</option> are
@ -209,11 +214,6 @@ following incompatible changes:</para>
For <literal>stateVersion = "17.09"</literal> or lower the old behavior is preserved.
</para>
<itemizedlist>
<listitem>
<para>
<literal>sound.enable</literal> now defaults to false.
</para>
</listitem>
<listitem>
<para>
<literal>matrix-synapse</literal> uses postgresql by default instead of sqlite.

5
nixos/modules/programs/chromium.nix
View File

@ -36,6 +36,7 @@ in
"chlffgpmiacpedhhbkiomidkjlcfhogd" # pushbullet
"mbniclmhobmnbdlbpiphghaielnnpgdp" # lightshot
"gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere
"cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
]
'';
};
@ -78,7 +79,11 @@ in
###### implementation
config = lib.mkIf cfg.enable {
# for chromium
environment.etc."chromium/policies/managed/default.json".text = builtins.toJSON defaultProfile;
environment.etc."chromium/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts;
# for google-chrome https://www.chromium.org/administrators/linux-quick-start
environment.etc."opt/chrome/policies/managed/default.json".text = builtins.toJSON defaultProfile;
environment.etc."opt/chrome/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts;
};
}

10
nixos/modules/services/audio/alsa.nix
View File

@ -21,7 +21,7 @@ in
enable = mkOption {
type = types.bool;
defaultText = "!versionAtLeast system.stateVersion \"18.03\"";
default = false;
description = ''
Whether to enable ALSA sound.
'';
@ -78,11 +78,7 @@ in
###### implementation
config = mkMerge [
({
sound.enable = mkDefault (!versionAtLeast config.system.stateVersion "18.03");
})
(mkIf config.sound.enable {
config = mkIf config.sound.enable {
environment.systemPackages = [ alsaUtils ];
@ -128,6 +124,6 @@ in
];
};
})];
};
}

6
nixos/modules/services/hardware/fwupd.nix
View File

@ -8,12 +8,8 @@ let
cfg = config.services.fwupd;
originalEtc =
let
isRegular = v: v == "regular";
listFiles = d: builtins.attrNames (filterAttrs (const isRegular) (builtins.readDir d));
copiedDirs = [ "fwupd/remotes.d" "pki/fwupd" "pki/fwupd-metadata" ];
originalFiles = concatMap (d: map (f: "${d}/${f}") (listFiles "${pkgs.fwupd}/etc/${d}")) copiedDirs;
mkEtcFile = n: nameValuePair n { source = "${pkgs.fwupd}/etc/${n}"; };
in listToAttrs (map mkEtcFile originalFiles);
in listToAttrs (map mkEtcFile pkgs.fwupd.filesInstalledToEtc);
extraTrustedKeys =
let
mkName = p: "pki/fwupd/${baseNameOf (toString p)}";

2
nixos/modules/services/networking/tinc.nix
View File

@ -178,6 +178,8 @@ in
preStart = ''
mkdir -p /etc/tinc/${network}/hosts
chown tinc.${network} /etc/tinc/${network}/hosts
mkdir -p /etc/tinc/${network}/invitations
chown tinc.${network} /etc/tinc/${network}/invitations
# Determine how we should generate our keys
if type tinc >/dev/null 2>&1; then

2
nixos/release.nix
View File

@ -258,7 +258,7 @@ in rec {
tests.firefox = callTest tests/firefox.nix {};
tests.firewall = callTest tests/firewall.nix {};
tests.fleet = callTestOnTheseSystems ["x86_64-linux"] tests/fleet.nix {};
#tests.fwupd = callTest tests/fwupd.nix {}; # build during evaluation
tests.fwupd = callTest tests/fwupd.nix {};
#tests.gitlab = callTest tests/gitlab.nix {};
tests.gitolite = callTest tests/gitolite.nix {};
tests.gjs = callTest tests/gjs.nix {};

6
pkgs/applications/editors/android-studio/default.nix
View File

@ -29,9 +29,9 @@ in rec {
# linux-beta-bundle
preview = mkStudio {
pname = "android-studio-preview";
version = "3.1.0.11"; # "Android Studio 3.1 Beta 3"
build = "173.4595152";
sha256Hash = "0106ggrf4mkxx3a2dn02km8rdq23sf15ifysykcay29skgdmq6wx";
version = "3.1.0.12"; # "Android Studio 3.1 Beta 4"
build = "173.4615496";
sha256Hash = "0rp0vg5hwv7kdrirydvnwznpfwibwwm2dxsbhbxfkyahph10ly72";
meta = stable.meta // {
description = "The Official IDE for Android (preview version)";

4
pkgs/applications/editors/micro/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "micro-${version}";
version = "1.3.4";
version = "1.4.0";
goPackagePath = "github.com/zyedidia/micro";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "zyedidia";
repo = "micro";
rev = "v${version}";
sha256 = "1giyp2xk2rb6vdyfnj5wa7qb9fwbcmmwm16wdlnmq7xnp7qamdkw";
sha256 = "0w1rmh81h28n1jlb05k89i751h498i6p883hrsjr70hvrwq5zjpb";
fetchSubmodules = true;
};

10
pkgs/applications/misc/mupdf/default.nix
View File

@ -29,6 +29,16 @@ in stdenv.mkDerivation rec {
url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=a910cd33a2b311712f83710dc042fbe80c104306";
sha256 = "05i9v2ia586jyjqdb7g68ss4vkfwgp6cwhagc8zzggsba83azyqk";
})
(fetchpatch {
name = "CVE-2018-6544.1.patch";
url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=b03def134988da8c800adac1a38a41a1f09a1d89;hp=26527eef77b3e51c2258c8e40845bfbc015e405d";
sha256 = "1rlmjibl73ls8xfpsz69axa3lw5l47vb0a1dsjqziszsld4lpj5i";
})
(fetchpatch {
name = "CVE-2018-6544.2.patch";
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=26527eef77b3e51c2258c8e40845bfbc015e405d;hp=ab98356f959c7a6e94b1ec10f78dd2c33ed3f3e7";
sha256 = "1brcc029s5zmd6ya0d9qk3mh9qwx5g6vhsf1j8h879092sya5627";
})
]
# Use shared libraries to decrease size

19
pkgs/applications/science/math/sage/default.nix
View File

@ -21,7 +21,7 @@
, bash
, fetchurl
, perl
, gfortran
, gfortran6
, python
, autoreconfHook
, gettext
@ -94,13 +94,13 @@ stdenv.mkDerivation rec {
bash # needed for the build
perl # needed for the build
python # needed for the build
gfortran # needed to build giac, openblas
gfortran6 # needed to build giac, openblas
autoreconfHook # needed to configure sage with prefix
gettext # needed to build the singular spkg
hevea # needed to build the docs of the giac spkg
which # needed in configure of mpir
# needed to build the docs of the giac spkg
texinfo # needed to build maxima
] ++ stdenv.lib.optionals(buildDocs) [
hevea # needed to build the docs of the giac spkg
(texlive.combine { inherit (texlive)
scheme-basic
collection-pstricks # needed by giac
@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ gfortran perl which ];
nativeBuildInputs = [ gfortran6 perl which ];
patches = [
# fix usages of /bin/rm
@ -153,13 +153,13 @@ stdenv.mkDerivation rec {
cd ..
mv "$dir" "$out/sage-root"
export SAGE_SPKG_INSTALL_DOCS='no'
cd "$out/sage-root" # build in target dir, since `make` is also `make install`
''
+ stdenv.lib.optionalString (buildDocs) ''
mkdir -p "$doc"
export SAGE_DOC="$doc"
export SAGE_DOCBUILD_OPTS="--no-pdf-links -k"
export SAGE_SPKG_INSTALL_DOCS='no'
'';
buildFlags = if (buildDocs) then "doc" else "build";
@ -191,6 +191,13 @@ stdenv.mkDerivation rec {
rm -f "$out/sage-root/config.status"
rm -f "$out/sage-root/build/make/Makefile-auto"
rm -f "$out/sage-home/.sage/gap/libgap-workspace-"*
# Make sure unnessessary packages don't end up in the build closure
find "$out" \
-iname 'config.log' \
-delete \
-or -iname 'Makefile' \
-delete
rm -f "$out/lib/R/etc/Renviron"
# Make sure all shebangs are properly patched
bash $patchSageShebangs $out
'';

4
pkgs/data/misc/hackage/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/4c8b3501ea6fc9f41cd192ddc08e2d9583a1e679.tar.gz";
sha256 = "0aa4pimgllqgn8bcy2p2cdwbpz6s6wk8j41w35jvzaqfj15gysnq";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/46704e06debe8b2c7c875d5e910fe168d7e49827.tar.gz";
sha256 = "131ga0pz1h7f3zimrd7yn6v8q7j2wh6srjrvl97p9bx1cbg8xqgl";
}

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -833,7 +833,7 @@ self: super: {
rev = "8b79823c32e234c161baec67fdf7907952ca62b8";
sha256 = "0hyrcyssclkdfcw2kgcark8jl869snwnbrhr9k0a9sbpk72wp7nz";
};
}).override { language-c = self.language-c_0_7_2; };
});
# Needs pginit to function and pgrep to verify.
tmp-postgres = overrideCabal super.tmp-postgres (drv: {

2
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -197,7 +197,9 @@ self: super: {
mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
natural-transformation = addBuildDepend super.natural-transformation self.semigroups;
optparse-applicative = addBuildDepends super.optparse-applicative [self.semigroups self.fail];
parsec = addBuildDepends super.parsec [self.fail self.semigroups];
QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
reflection = addBuildDepend super.reflection self.semigroups;
semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [hashable tagged text unordered-containers]);
texmath = addBuildDepend super.texmath self.network-uri;
yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; });

25
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View File

@ -62,13 +62,7 @@ self: super: {
## Needs bump to a versioned attribute
## Issue: https://github.com/sol/doctest/issues/189
doctest = overrideCabal super.doctest_0_14_0 (drv: {
## Setup: Encountered missing dependencies:
## ghc >=7.0 && <8.4
##
## uncaught exception: IOException of type NoSuchThing (test/integration/testImport: changeWorkingDirectory: does not exist (No such file or directory))
doCheck = false;
});
doctest = dontCheck super.doctest_0_14_1; # test suite fails in Nix
## Needs bump to a versioned attribute
## • Could not deduce (Semigroup (IterT m a))
@ -112,12 +106,6 @@ self: super: {
## hspec-discover ==2.4.7
hspec-discover = super.hspec-discover_2_4_8;
## Needs bump to a versioned attribute
## Ambiguous occurrence ‘<>’
## It could refer to either ‘Prelude.<>’,
## imported from ‘Prelude’ at src/Language/C/Pretty.hs:15:8-24
language-c = super.language-c_0_7_2;
## Needs bump to a versioned attribute
## Setup: Encountered missing dependencies:
## free ==4.*, template-haskell >=2.4 && <2.13
@ -131,12 +119,6 @@ self: super: {
## doctest >=0.11.1 && <0.14
semigroupoids = super.semigroupoids_5_2_2;
## Needs bump to a versioned attribute
## • No instance for (Semigroup Builder)
## arising from the superclasses of an instance declaration
## • In the instance declaration for ‘Monoid Builder’
stringbuilder = super.stringbuilder_0_5_1;
## Needs bump to a versioned attribute
## Issue: https://github.com/haskell/test-framework/issues/35
test-framework = overrideCabal super.test-framework_0_8_2_0 (drv: {
@ -489,11 +471,6 @@ self: super: {
jailbreak = true;
});
doctest_0_14_0 = overrideCabal super.doctest_0_14_0 (drv: {
## uncaught exception: IOException of type NoSuchThing (test/integration/testImport: changeWorkingDirectory: does not exist (No such file or directory))
doCheck = false;
});
exception-transformers = overrideCabal super.exception-transformers (drv: {
## Setup: Encountered missing dependencies:
## HUnit >=1.2 && <1.6

139
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -38,7 +38,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
# LTS Haskell 10.5
# LTS Haskell 10.6
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@ -77,7 +77,7 @@ default-package-overrides:
- aeson-utils ==0.3.0.2
- aeson-yak ==0.1.1.3
- Agda ==2.5.3
- airship ==0.9.2
- airship ==0.9.3
- alarmclock ==0.4.0.3
- alerta ==0.1.0.6
- alerts ==0.1.0.0
@ -209,7 +209,7 @@ default-package-overrides:
- async-extra ==0.2.0.0
- async-refresh ==0.2.0.2
- async-refresh-tokens ==0.3.0.1
- async-timer ==0.1.4.0
- async-timer ==0.1.4.1
- atom-basic ==0.2.5
- atom-conduit ==0.5.0.1
- atomic-primops ==0.8.1.1
@ -367,7 +367,7 @@ default-package-overrides:
- cassava-conduit ==0.4.0.1
- cassette ==0.1.0
- cast ==0.1.0.2
- cayley-client ==0.4.2
- cayley-client ==0.4.3
- cereal ==0.5.5.0
- cereal-conduit ==0.7.3
- cereal-text ==0.1.0.2
@ -376,9 +376,9 @@ default-package-overrides:
- ChannelT ==0.0.0.4
- charset ==0.3.7.1
- charsetdetect-ae ==1.1.0.3
- Chart ==1.8.2
- Chart-cairo ==1.8.2
- Chart-diagrams ==1.8.2
- Chart ==1.8.3
- Chart-cairo ==1.8.3
- Chart-diagrams ==1.8.3
- chart-unit ==0.5.5.0
- chaselev-deque ==0.5.0.5
- ChasingBottoms ==1.3.1.3
@ -427,7 +427,7 @@ default-package-overrides:
- colour ==2.3.4
- colour-accelerate ==0.2.0.0
- combinatorial ==0.0
- comfort-graph ==0.0.2.1
- comfort-graph ==0.0.3
- commutative ==0.0.1.4
- comonad ==5.0.3
- comonads-fd ==4.0
@ -448,7 +448,7 @@ default-package-overrides:
- concurrent-supply ==0.1.8
- cond ==0.4.1.1
- conduit ==1.2.13
- conduit-algorithms ==0.0.7.1
- conduit-algorithms ==0.0.7.2
- conduit-combinators ==1.1.2
- conduit-connection ==0.1.0.4
- conduit-extra ==1.2.3.2
@ -516,7 +516,7 @@ default-package-overrides:
- cubicbezier ==0.6.0.5
- cubicspline ==0.1.2
- cublas ==0.4.0.0
- cuda ==0.9.0.0
- cuda ==0.9.0.1
- cue-sheet ==1.0.1
- cufft ==0.8.0.0
- curl ==1.3.8
@ -628,7 +628,7 @@ default-package-overrides:
- docopt ==0.7.0.5
- doctemplates ==0.2.1
- doctest ==0.13.0
- doctest-discover ==0.1.0.7
- doctest-discover ==0.1.0.8
- doctest-driver-gen ==0.1.0.1
- do-list ==1.0.1
- dom-parser ==3.0.0
@ -678,7 +678,7 @@ default-package-overrides:
- EntrezHTTP ==1.0.4
- entropy ==0.3.8
- enummapset ==0.5.2.1
- enumset ==0.0.4
- enumset ==0.0.4.1
- envelope ==0.2.2.0
- envparse ==0.4
- envy ==1.3.0.2
@ -702,7 +702,7 @@ default-package-overrides:
- eventful-sql-common ==0.2.0
- eventful-sqlite ==0.2.0
- eventful-test-helpers ==0.2.0
- event-list ==0.1.1.3
- event-list ==0.1.2
- eventsource-api ==1.1.1
- eventsource-geteventstore-store ==1.0.4
- eventsource-store-specs ==1.0.1
@ -719,7 +719,7 @@ default-package-overrides:
- executable-path ==0.0.3.1
- exhaustive ==1.1.5
- expiring-cache-map ==0.0.6.1
- explicit-exception ==0.1.9
- explicit-exception ==0.1.9.2
- exp-pairs ==0.1.5.2
- extensible ==0.4.7.1
- extensible-effects ==2.1.0.0
@ -735,7 +735,7 @@ default-package-overrides:
- fast-logger ==2.4.11
- fast-math ==1.0.2
- fb ==1.1.1
- fclabels ==2.0.3.2
- fclabels ==2.0.3.3
- fdo-notify ==0.3.1
- feature-flags ==0.1.0.1
- fedora-haskell-tools ==0.4
@ -767,7 +767,7 @@ default-package-overrides:
- flexible-defaults ==0.0.1.2
- FloatingHex ==0.4
- floatshow ==0.2.4
- flow ==1.0.10
- flow ==1.0.11
- fmlist ==0.9.2
- fmt ==0.5.0.0
- fn ==0.3.0.2
@ -840,7 +840,7 @@ default-package-overrides:
- getopt-generics ==0.13.0.1
- ghc-compact ==0.1.0.0
- ghc-core ==0.5.6
- ghc-events ==0.7.0
- ghc-events ==0.7.1
- ghc-exactprint ==0.5.6.0
- ghcid ==0.6.10
- ghcjs-base-stub ==0.1.0.4
@ -891,7 +891,7 @@ default-package-overrides:
- GLURaw ==2.0.0.3
- GLUT ==2.7.0.12
- gluturtle ==0.0.58.1
- gnuplot ==0.5.5
- gnuplot ==0.5.5.1
- goggles ==0.1.0.3
- gogol ==0.3.0
- gogol-adexchange-buyer ==0.3.0
@ -1038,7 +1038,7 @@ default-package-overrides:
- hasbolt ==0.1.3.0
- hashable ==1.2.6.1
- hashable-time ==0.2.0.1
- hashids ==1.0.2.3
- hashids ==1.0.2.4
- hashmap ==1.3.3
- hashtables ==1.2.2.1
- haskeline ==0.7.4.2
@ -1154,7 +1154,7 @@ default-package-overrides:
- hpio ==0.9.0.5
- hpp ==0.5.1
- hpqtypes ==1.5.1.1
- hprotoc ==2.4.6
- hprotoc ==2.4.7
- hquantlib ==0.0.4.0
- hreader ==1.1.0
- hreader-lens ==0.1.3.0
@ -1167,8 +1167,8 @@ default-package-overrides:
- hsebaysdk ==0.4.0.0
- hse-cpp ==0.2
- hsemail ==2
- hset ==2.2.0
- HSet ==0.0.1
- hset ==2.2.0
- hsexif ==0.6.1.5
- hs-GeoIP ==0.3
- hsignal ==0.2.7.5
@ -1301,8 +1301,8 @@ default-package-overrides:
- intern ==0.9.1.4
- interpolate ==0.1.1
- interpolatedstring-perl6 ==1.0.0
- Interpolation ==0.3.0
- interpolation ==0.1.0.2
- Interpolation ==0.3.0
- IntervalMap ==0.5.3.1
- intervals ==0.8.1
- intro ==0.3.1.0
@ -1318,9 +1318,9 @@ default-package-overrides:
- io-streams-haproxy ==1.0.0.2
- ip ==1.1.2
- ip6addr ==0.5.3
- iproute ==1.7.1
- iproute ==1.7.2
- IPv6Addr ==1.0.1
- IPv6DB ==0.2.4
- IPv6DB ==0.2.5
- ipython-kernel ==0.9.0.1
- irc ==0.6.1.0
- irc-client ==1.0.1.1
@ -1335,7 +1335,7 @@ default-package-overrides:
- ixset ==1.0.7
- ixset-typed ==0.3.1.1
- ix-shapable ==0.1.0
- jack ==0.7.1.1
- jack ==0.7.1.3
- jailbreak-cabal ==1.3.2
- javascript-extras ==0.3.2.0
- jmacro ==0.6.14
@ -1379,7 +1379,7 @@ default-package-overrides:
- labels ==0.3.3
- lackey ==0.4.7
- lame ==0.1.1
- language-c ==0.7.1
- language-c ==0.7.2
- language-c-quote ==0.12.1
- language-docker ==1.0.0
- language-fortran ==0.5.1
@ -1387,7 +1387,7 @@ default-package-overrides:
- language-haskell-extract ==0.2.4
- language-java ==0.2.8
- language-javascript ==0.6.0.10
- language-puppet ==1.3.14
- language-puppet ==1.3.15
- lapack-carray ==0.0
- lapack-ffi ==0.0
- lapack-ffi-tools ==0.0.0.1
@ -1462,10 +1462,10 @@ default-package-overrides:
- lrucache ==1.2.0.0
- lrucaching ==0.3.3
- lucid ==2.9.9
- lxd-client ==0.1.0.5
- lxd-client ==0.1.0.6
- lxd-client-config ==0.1.0.1
- lzma ==0.0.0.3
- lzma-conduit ==1.2.0
- lzma-conduit ==1.2.1
- machines ==0.6.3
- machines-binary ==0.3.0.3
- machines-directory ==0.2.1.0
@ -1475,7 +1475,7 @@ default-package-overrides:
- mainland-pretty ==0.6.1
- makefile ==1.1.0.0
- mallard ==0.6.1.1
- managed ==1.0.5
- managed ==1.0.6
- mandrill ==0.5.3.2
- markdown ==0.1.16
- markdown-unlit ==0.4.1
@ -1518,7 +1518,7 @@ default-package-overrides:
- microsoft-translator ==0.1.1
- microspec ==0.1.0.0
- microstache ==1.0.1.1
- midi ==0.2.2.1
- midi ==0.2.2.2
- midi-music-box ==0.0.0.4
- mighty-metropolis ==1.2.0
- milena ==0.5.2.1
@ -1544,7 +1544,7 @@ default-package-overrides:
- model ==0.4.4
- modern-uri ==0.1.2.1
- modify-fasta ==0.8.2.3
- moesocks ==1.0.0.43
- moesocks ==1.0.0.44
- mole ==0.0.6
- monad-control ==1.0.2.2
- monad-control-aligned ==0.0.1
@ -1579,14 +1579,14 @@ default-package-overrides:
- monad-time ==0.2
- monad-unlift ==0.2.0
- monad-unlift-ref ==0.2.1
- mongoDB ==2.3.0.2
- mongoDB ==2.3.0.4
- monoidal-containers ==0.3.0.2
- monoid-extras ==0.4.2
- monoid-subclasses ==0.4.4
- monoid-transformer ==0.0.3
- monoid-transformer ==0.0.4
- mono-traversable ==1.0.8.1
- mono-traversable-instances ==0.1.0.0
- morte ==1.6.14
- morte ==1.6.15
- mountpoints ==1.0.2
- mstate ==0.2.7
- mtl ==2.2.1
@ -1626,7 +1626,7 @@ default-package-overrides:
- nettle ==0.2.0
- netwire ==5.0.2
- netwire-input ==0.0.6
- netwire-input-glfw ==0.0.7
- netwire-input-glfw ==0.0.8
- network ==2.6.3.3
- network-anonymous-i2p ==0.10.0
- network-anonymous-tor ==0.11.0
@ -1647,7 +1647,7 @@ default-package-overrides:
- network-transport-tests ==0.2.4.2
- network-uri ==2.6.1.0
- newtype ==0.2
- newtype-generics ==0.5.1
- newtype-generics ==0.5.2.1
- next-ref ==0.1.0.2
- nfc ==0.1.0
- nicify-lib ==1.0.1
@ -1658,7 +1658,7 @@ default-package-overrides:
- nondeterminism ==1.4
- non-empty ==0.3
- non-empty-sequence ==0.2.0.2
- non-negative ==0.1.1.2
- non-negative ==0.1.2
- normaldistribution ==1.1.0.3
- normalization-insensitive ==2.0.1
- NoTrace ==0.3.0.2
@ -1666,7 +1666,7 @@ default-package-overrides:
- n-tuple ==0.0.1.1
- numbers ==3000.2.0.1
- numeric-extras ==0.1
- numeric-prelude ==0.4.2
- numeric-prelude ==0.4.3
- numhask ==0.1.4.0
- numhask-range ==0.1.3.0
- NumInstances ==1.4
@ -1702,7 +1702,7 @@ default-package-overrides:
- operational ==0.2.3.5
- operational-class ==0.3.0.0
- opml-conduit ==0.6.0.4
- optional-args ==1.0.1
- optional-args ==1.0.2
- options ==1.2.1.1
- optparse-applicative ==0.14.0.0
- optparse-generic ==1.2.3
@ -1727,16 +1727,16 @@ default-package-overrides:
- ParsecTools ==0.0.2.0
- parser-combinators ==0.4.0
- parsers ==0.12.8
- partial-handler ==1.0.2
- partial-handler ==1.0.3
- partial-isomorphisms ==0.2.2.1
- partial-order ==0.1.2.1
- partial-semigroup ==0.3.0.2
- partial-semigroup ==0.3.0.3
- path ==0.6.1
- path-extra ==0.0.6
- path-io ==1.3.3
- path-pieces ==0.2.1
- path-text-utf8 ==0.0.1.0
- pathtype ==0.8
- pathtype ==0.8.1
- pathwalk ==0.3.1.2
- patience ==0.1.1
- pattern-arrows ==0.0.2
@ -1799,7 +1799,7 @@ default-package-overrides:
- pointedlist ==0.6.1
- pointful ==1.0.9
- pointless-fun ==1.1.0.6
- poll ==0.0
- poll ==0.0.0.1
- poly-arity ==0.1.0
- polynomials-bernstein ==1.1.2
- polyparse ==1.12
@ -1858,8 +1858,8 @@ default-package-overrides:
- prompt ==0.1.1.2
- protobuf ==0.2.1.1
- protobuf-simple ==0.1.0.5
- protocol-buffers ==2.4.6
- protocol-buffers-descriptor ==2.4.6
- protocol-buffers ==2.4.7
- protocol-buffers-descriptor ==2.4.7
- proto-lens ==0.2.2.0
- proto-lens-arbitrary ==0.1.1.1
- proto-lens-combinators ==0.1.0.8
@ -1983,7 +1983,7 @@ default-package-overrides:
- retry ==0.7.6.0
- rev-state ==0.1.2
- rfc5051 ==0.1.0.3
- riak ==1.1.2.3
- riak ==1.1.2.4
- riak-protobuf ==0.23.0.0
- RNAlien ==1.3.7
- rng-utils ==0.3.0
@ -2008,8 +2008,8 @@ default-package-overrides:
- say ==0.1.0.0
- sbp ==2.3.6
- sbv ==7.4
- scalendar ==1.2.0
- SCalendar ==1.1.0
- scalendar ==1.2.0
- scalpel ==0.5.1
- scalpel-core ==0.5.1
- scanner ==0.2
@ -2049,7 +2049,7 @@ default-package-overrides:
- servant-exceptions ==0.1.1
- servant-foreign ==0.10.1
- servant-generic ==0.1.0.1
- servant-js ==0.9.3.1
- servant-js ==0.9.3.2
- servant-JuicyPixels ==0.3.0.3
- servant-kotlin ==0.1.0.3
- servant-lucid ==0.7.1
@ -2062,7 +2062,7 @@ default-package-overrides:
- servant-static-th ==0.1.0.6
- servant-subscriber ==0.6.0.1
- servant-swagger ==1.1.4
- servant-swagger-ui ==0.2.4.3.4.0
- servant-swagger-ui ==0.2.5.3.9.1
- servant-websockets ==1.0.0
- servant-yaml ==0.1.0.0
- serversession ==1.0.1
@ -2072,13 +2072,13 @@ default-package-overrides:
- serversession-frontend-yesod ==1.0
- servius ==1.2.0.3
- ses-html ==0.4.0.0
- set-cover ==0.0.8
- set-cover ==0.0.9
- setenv ==0.1.1.3
- setlocale ==1.0.0.5
- set-monad ==0.2.0.0
- sets ==0.0.5.2
- SHA ==1.6.4.2
- shake ==0.16
- shake ==0.16.2
- shake-language-c ==0.11.0
- shakespeare ==2.0.15
- shell-conduit ==4.6.1
@ -2096,7 +2096,7 @@ default-package-overrides:
- simple-sendfile ==0.2.27
- simple-session ==0.10.1.1
- simple-templates ==0.8.0.1
- singleton-bool ==0.1.2.0
- singleton-bool ==0.1.3
- singleton-nats ==0.4.0.4
- singletons ==2.3.1
- siphash ==1.0.3
@ -2123,9 +2123,9 @@ default-package-overrides:
- sort ==1.0.0.0
- sorted-list ==0.2.0.0
- sourcemap ==0.1.6
- sox ==0.2.2.7
- sox ==0.2.3
- soxlib ==0.0.3
- sparse-linear-algebra ==0.2.9.8
- sparse-linear-algebra ==0.2.9.9
- spdx ==0.2.2.0
- special-values ==0.1.0.0
- speculate ==0.3.2
@ -2170,9 +2170,9 @@ default-package-overrides:
- stopwatch ==0.1.0.4
- storable-complex ==0.2.2
- storable-endian ==0.2.6
- storable-record ==0.0.3.1
- storable-record ==0.0.4
- storable-tuple ==0.0.3.3
- storablevector ==0.2.12.1
- storablevector ==0.2.13
- store ==0.4.3.2
- store-core ==0.4.1
- Strafunski-StrategyLib ==5.0.0.10
@ -2189,8 +2189,8 @@ default-package-overrides:
- strict-concurrency ==0.2.4.2
- strict-types ==0.1.2
- stringable ==0.1.3
- stringbuilder ==0.5.0
- string-class ==0.1.6.5
- stringbuilder ==0.5.1
- string-class ==0.1.7.0
- string-combinators ==0.6.0.5
- string-conv ==0.1.2
- string-conversions ==0.4.0.1
@ -2241,7 +2241,7 @@ default-package-overrides:
- tasty-expected-failure ==0.11.0.4
- tasty-fail-fast ==0.0.3
- tasty-golden ==2.3.1.2
- tasty-hedgehog ==0.1.0.1
- tasty-hedgehog ==0.1.0.2
- tasty-hspec ==1.1.3.3
- tasty-html ==0.4.1.1
- tasty-hunit ==0.9.2
@ -2310,7 +2310,7 @@ default-package-overrides:
- threads ==0.5.1.5
- threads-extras ==0.1.0.2
- threepenny-editors ==0.5.6
- threepenny-gui ==0.8.2.0
- threepenny-gui ==0.8.2.1
- threepenny-gui-flexbox ==0.4.2
- th-reify-compat ==0.0.1.3
- th-reify-many ==0.1.8
@ -2391,7 +2391,7 @@ default-package-overrides:
- type-spec ==0.3.0.1
- typography-geometry ==1.0.0.1
- tz ==0.1.3.0
- tzdata ==0.1.20170320.0
- tzdata ==0.1.20180122.0
- ua-parser ==0.7.4.1
- uglymemo ==0.1.0.1
- unagi-chan ==0.4.1.0
@ -2402,7 +2402,7 @@ default-package-overrides:
- unexceptionalio ==0.3.0
- unfoldable ==0.9.5
- unfoldable-restricted ==0.0.3
- unicode ==0.0
- unicode ==0.0.1
- unicode-show ==0.1.0.2
- unicode-transforms ==0.3.3
- unification-fd ==0.10.0.1
@ -2450,19 +2450,19 @@ default-package-overrides:
- validate-input ==0.4.0.0
- validation ==0.6.2
- validationt ==0.2.0.0
- validity ==0.4.0.3
- validity ==0.4.0.4
- validity-aeson ==0.1.0.0
- validity-bytestring ==0.2.0.0
- validity-containers ==0.2.0.0
- validity-path ==0.2.0.2
- validity-scientific ==0.1.0.0
- validity-text ==0.2.0.0
- validity-text ==0.2.0.1
- validity-time ==0.1.0.0
- validity-unordered-containers ==0.1.0.0
- validity-uuid ==0.0.0.0
- validity-vector ==0.1.0.0
- varying ==0.7.0.3
- vault ==0.3.0.7
- vault ==0.3.1.0
- vcswrapper ==0.1.6
- vector ==0.12.0.1
- vector-algorithms ==0.7.0.1
@ -2505,7 +2505,7 @@ default-package-overrides:
- wai-middleware-crowd ==0.1.4.2
- wai-middleware-metrics ==0.2.4
- wai-middleware-prometheus ==0.3.0
- wai-middleware-rollbar ==0.8.3
- wai-middleware-rollbar ==0.8.4
- wai-middleware-static ==0.8.1
- wai-middleware-throttle ==0.2.2.0
- wai-predicates ==0.10.0
@ -2585,7 +2585,7 @@ default-package-overrides:
- xlsx ==0.6.0
- xlsx-tabular ==0.2.2
- xml ==1.3.14
- xml-basic ==0.1.2
- xml-basic ==0.1.3
- xml-conduit ==1.7.1.2
- xml-conduit-parse ==0.3.1.2
- xml-conduit-writer ==0.1.1.2
@ -2658,7 +2658,7 @@ default-package-overrides:
- zeromq4-haskell ==0.7.0
- zim-parser ==0.2.1.0
- zip ==0.2.0
- zip-archive ==0.3.2.2
- zip-archive ==0.3.2.3
- zippers ==0.2.5
- ziptastic-client ==0.3.0.3
- ziptastic-core ==0.2.0.3
@ -2697,7 +2697,6 @@ extra-packages:
- hoogle == 5.0.14 # required by hie-hoogle
- inline-c < 0.6 # required on GHC 8.0.x
- inline-c-cpp < 0.2 # required on GHC 8.0.x
- language-c == 0.7.0 # required by c2hs hack to work around https://github.com/haskell/c2hs/issues/192.
- mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
- mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms
- network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below

1914
pkgs/development/haskell-modules/hackage-packages.nix
View File

File diff suppressed because it is too large Load Diff

18
pkgs/development/libraries/umockdev/default.nix
View File

@ -1,25 +1,21 @@
{ stdenv, fetchFromGitHub, autoreconfHook
{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gtk_doc
, pkgconfig, glib, systemd, libgudev, vala }:
stdenv.mkDerivation rec {
name = "umockdev";
version = "0.8.13";
name = "umockdev-${version}";
version = "0.11";
src = fetchFromGitHub {
owner = "martinpitt";
repo = "umockdev";
rev = version;
sha256 ="0bw2dpshlgbdwg5mhq4j22z474llpqix8pxii63r2bk5nhjc537k";
sha256 ="1gpk2f03nad4qv084hx7549d68cqc1xibxm0ncanafm5xjz1hp55";
};
buildInputs = [ glib systemd libgudev vala ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ glib systemd libgudev ];
nativeBuildInputs = [ automake autoconf libtool gtk_doc pkgconfig vala ];
### docs/gtk-doc.make not found
prePatch = ''
sed -i 's|include $(top_srcdir)/docs/gtk-doc.make||g' docs/reference/Makefile.am
sed -i 's|+=|=|g' docs/reference/Makefile.am
'';
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
meta = with stdenv.lib; {
description = "Mock hardware devices for creating unit tests";

4
pkgs/development/python-modules/send2trash/default.nix
View File

@ -1,4 +1,5 @@
{ lib
{ stdenv
, lib
, buildPythonPackage
, fetchFromGitHub
, pytest
@ -16,6 +17,7 @@ buildPythonPackage rec {
sha256 = "1w502i5h8xaqf03g6h95h4vs1wqfv6kg925dn63phrwmg1hfz2xx";
};
doCheck = !stdenv.isDarwin;
checkPhase = "HOME=. py.test";
checkInputs = [ pytest configparser ];

29
pkgs/misc/cups/drivers/zj-58/default.nix Normal file
View File

@ -0,0 +1,29 @@
{stdenv, fetchFromGitHub, cups}:
stdenv.mkDerivation rec {
pname = "cups-zj-58";
version = "2018-02-22";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "klirichek";
repo = "zj-58";
rev = "e4212cd";
sha256 = "1w2qkspm4qqg5h8n6gmakzhiww7gag64chvy9kf89xsl3wsyp6pi";
};
buildInputs = [ cups ];
installPhase = ''
install -D rastertozj $out/lib/cups/filter/rastertozj
install -D ZJ-58.ppd $out/share/cups/model/zjiang/ZJ-58.ppd
'';
meta = with stdenv.lib; {
description = "CUPS filter for thermal printer Zjiang ZJ-58";
homepage = https://github.com/klirichek/zj-58;
platforms = platforms.linux;
maintainers = with maintainers; [ makefu ];
license = licenses.bsd2;
};
}

35
pkgs/os-specific/linux/firmware/fwupd/default.nix
View File

@ -6,14 +6,15 @@
, shared_mime_info, umockdev
}:
let
version = "1.0.4";
# Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc
version = "1.0.5";
python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]);
installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]);
in stdenv.mkDerivation {
name = "fwupd-${version}";
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
sha256 = "1n4d6fw3ffg051072hbxn106s52x2wlh5dh2kxwdfjsb5kh03ra3";
sha256 = "0wm195vkf6x1kg1dz0sbfwpdcn9f6638l7vyzplcfrb3v07pqxpq";
};
outputs = [ "out" "devdoc" "man" "installedTests" ];
@ -31,20 +32,9 @@ in stdenv.mkDerivation {
patches = [
./fix-missing-deps.patch
# https://github.com/hughsie/fwupd/issues/403
(fetchpatch {
url = https://github.com/hughsie/fwupd/commit/bd6082574989e4f48b66c7270bb408d439b77a06.patch;
sha256 = "17pixyizkmn6wlsjmr1wwya17ivn770hdv9mp769vifxinya8w9y";
})
# drop docbook2man
(fetchpatch {
url = https://github.com/hughsie/fwupd/commit/2c43d3e6e65868b66a9a64a76123697e259ec7c2.patch;
sha256 = "0vjv7jnai0g96frlipk2sc59pj3mhq9di01hajycjv7y5v6qqrmc";
})
# https://github.com/hughsie/fwupd/issues/405
(fetchpatch {
url = https://github.com/hughsie/fwupd/pull/407.patch;
sha256 = "1dxhqps12x7bz0s974xk5hfpk4nwn1gs29vl0dfi9j54wy18f688";
url = https://github.com/hughsie/fwupd/commit/767210e4b1401d5d5bb7ac1e7c052a60b6529d88.patch;
sha256 = "00adfabxpgdg74jx7i6jihhh8njjk2r7v3fxqs4scj3vn06k5fmw";
})
];
@ -77,7 +67,20 @@ in stdenv.mkDerivation {
--prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0:${libsoup}/lib/girepository-1.0"
'';
enableParallelBuilding = true;
passthru = {
filesInstalledToEtc = [
"fwupd/remotes.d/fwupd.conf"
"fwupd/remotes.d/lvfs-testing.conf"
"fwupd/remotes.d/lvfs.conf"
"fwupd/remotes.d/vendor.conf"
"pki/fwupd/GPG-KEY-Hughski-Limited"
"pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"
"pki/fwupd/LVFS-CA.pem"
"pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service"
"pki/fwupd-metadata/LVFS-CA.pem"
];
};
meta = with stdenv.lib; {
homepage = https://fwupd.org/;
maintainers = with maintainers; [];

83
pkgs/os-specific/linux/firmware/fwupdate/default.nix
View File

@ -1,37 +1,62 @@
{ stdenv, fetchurl, gnu-efi, efivar, libsmbios, popt, pkgconfig
, gettext }:
let version = "8"; in
stdenv.mkDerivation
{ name = "fwupdate-${version}";
src = fetchurl
{ url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2";
sha256 = "10q8k1kghvbcb5fwcl2smzp8vqdfzimx9dkk0c3hz39py1phy4n8";
{ efivar, fetchurl, gettext, gnu-efi, libsmbios, pkgconfig, popt, stdenv }:
let
version = "10";
in stdenv.mkDerivation {
name = "fwupdate-${version}";
src = fetchurl {
url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2";
sha256 = "0fpk3q0msq2l0bs2mvk0cqp8jbwnmi17ggc81r4v96h4jxh2rx3k";
};
makeFlags =
[ "EFIDIR=nixos"
patches = [
# https://github.com/rhboot/fwupdate/pull/99
./fix-paths.patch
./do-not-create-sharedstatedir.patch
];
NIX_CFLAGS_COMPILE = [ "-I${gnu-efi}/include/efi" ];
# TODO: Just apply the disable to the efi subdir
hardeningDisable = [ "stackprotector" ];
makeFlags = [
"EFIDIR=nixos"
"prefix=$(out)"
"LIBDIR=$(out)/lib"
"GNUEFIDIR=${gnu-efi}/lib"
"TARGETDIR=$(out)/boot/efi/nixos/"
"prefix=$(out)/"
"ESPMOUNTPOINT=$(out)/boot"
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gnu-efi libsmbios popt gettext ];
propagatedBuildInputs = [ efivar ];
# TODO: Just apply the disable to the efi subdir
hardeningDisable = [ "all" ];
patchPhase = ''
sed -i 's|/usr/include/smbios_c/token.h|smbios_c/token.h|' \
linux/libfwup.c
sed -i 's|/usr/share|$(prefix)share|' linux/Makefile
sed -i "s|/usr/include|$out/include|" linux/fwup.pc.in
find . -type f -print0 | xargs -0 sed -i -e 's|/boot/efi|/boot|g' -e 's|/boot/efi/EFI|/boot/EFI|g'
'';
configurePhase = ''
nativeBuildInputs = [
pkgconfig
gettext
];
buildInputs = [
gnu-efi
libsmbios
popt
];
propagatedBuildInputs = [
efivar
];
# TODO: fix wrt cross-compilation
preConfigure = ''
arch=$(cc -dumpmachine | cut -f1 -d- | sed 's,i[3456789]86,ia32,' )
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gnu-efi}/include/efi -I${efivar}/include/efivar -I${gnu-efi}/include/efi/$arch"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gnu-efi}/include/efi/$arch"
'';
meta =
{ license = [ stdenv.lib.licenses.gpl2 ];
platforms = stdenv.lib.platforms.linux;
postInstall = ''
rm -rf $out/src
rm -rf $out/lib/debug
'';
meta = with stdenv.lib; {
description = "Tools for using the ESRT and UpdateCapsule() to apply firmware updates";
maintainers = with maintainers; [ ];
license = licenses.gpl2;
platforms = platforms.linux;
};
}

10
pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch Normal file
View File

@ -0,0 +1,10 @@
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -131,7 +131,6 @@
ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so.1,$(DESTDIR)$(libdir)/$(x)) ;\
ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so,$(DESTDIR)$(libdir)/$(x)) ;\
)
- $(INSTALL) -d -m 755 $(DESTDIR)$(sharedstatedir)/fwupdate/
$(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir)/fwupdate/
$(INSTALL) -m 755 cleanup $(DESTDIR)$(libexecdir)/fwupdate/cleanup
$(INSTALL) -d -m 755 $(DESTDIR)$(libdatadir)/systemd/system

116
pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch Normal file
View File

@ -0,0 +1,116 @@
--- a/Make.defaults
+++ b/Make.defaults
@@ -18,19 +18,20 @@
ABIDIFF := abidiff
ABIDW := abidw
prefix ?= /usr/
-prefix := $(abspath $(prefix))/
+prefix := $(abspath $(prefix))
+exec_prefix ?= $(prefix)
ARCH = $(shell $(CC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,)
ifeq ($(ARCH),x86_64)
- LIBDIR ?= $(prefix)lib64
+ LIBDIR ?= $(exec_prefix)/lib64
endif
ifeq ($(ARCH),ia32)
- LIBDIR ?= $(prefix)lib
+ LIBDIR ?= $(exec_prefix)/lib
endif
ifeq ($(ARCH),aarch64)
- LIBDIR ?= $(prefix)lib64
+ LIBDIR ?= $(exec_prefix)/lib64
endif
ifeq ($(ARCH),arm)
- LIBDIR ?= $(prefix)lib
+ LIBDIR ?= $(exec_prefix)/lib
endif
LIBDIR ?= unknown
ifeq ($(LIBDIR),unknown)
@@ -45,13 +46,13 @@
GNUEFIDIR ?= $(LIBDIR)/gnuefi
libdir ?= $(LIBDIR)
pcdir ?= $(libdir)/pkgconfig
-mandir ?= $(prefix)share/man
-includedir ?= $(prefix)include
-bindir ?= $(prefix)bin
-datadir ?= $(prefix)share
+mandir ?= $(prefix)/share/man
+includedir ?= $(prefix)/include
+bindir ?= $(exec_prefix)/bin
+datadir ?= $(prefix)/share
localedir ?= $(datadir)/locale
-libexecdir ?= $(prefix)libexec
-libdatadir ?= $(prefix)lib
+libexecdir ?= $(exec_prefix)/libexec
+libdatadir ?= $(exec_prefix)/lib
sharedstatedir ?= /var/lib
EFIDIR ?= $(shell x=$$(which --skip-alias --skip-functions git 2>/dev/null) ; [ -n "$$x" ] && git config --get fwupdate.efidir)
@@ -63,8 +64,8 @@
ESPMOUNTPOINT = "/boot/efi"
endif
-DEBUGINFO ?= $(prefix)lib/debug
-DEBUGSOURCE ?= $(prefix)src/debug
+DEBUGINFO ?= $(exec_prefix)/lib/debug
+DEBUGSOURCE ?= $(prefix)/src/debug
TARGETDIR ?= $(ESPMOUNTPOINT)/EFI/$(EFIDIR)
.PHONY: check_efidir_error
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -93,16 +93,19 @@
sed -e "s,@@VERSION@@,$(VERSION),g" \
-e "s,@@FWUP_MAJOR_VERSION@@,$(MAJOR_VERSION),g" \
-e "s,@@FWUP_MINOR_VERSION@@,$(MINOR_VERSION),g" \
+ -e "s,@@PREFIX@@,$(prefix),g" \
+ -e "s,@@EXEC_PREFIX@@,$(exec_prefix),g" \
-e "s,@@SHAREDSTATEDIR@@,$(sharedstatedir),g" \
-e "s,@@ESPMOUNTPOINT@@,$(ESPMOUNTPOINT),g" \
-e "s,@@EFIDIR@@,$(EFIDIR),g" \
-e "s,@@LIBDIR@@,$(libdir),g" \
-e "s,@@LIBEXECDIR@@,$(libexecdir),g" \
+ -e "s,@@INCLUDEDIR@@,$(includedir),g" \
$< > $@
tester : tester.c
- $(CC) -Wall -Werror -ggdb -L. -I./include -I/usr/include/efivar \
- -lefivar -lfwup -o $@ $^
+ $(CC) -Wall -Werror -ggdb -L. -I./include $(shell $(PKG_CONFIG) --cflags efivar) \
+ $(shell $(PKG_CONFIG) --libs efivar) -lfwup -o $@ $^
test : tester
LD_LIBRARY_PATH=$(shell pwd) ./tester
@@ -134,6 +137,6 @@
$(INSTALL) -d -m 755 $(DESTDIR)$(libdatadir)/systemd/system
$(INSTALL) -m 644 cleanup.service \
$(DESTDIR)$(libdatadir)/systemd/system/fwupdate-cleanup.service
- $(INSTALL) -d -m 755 $(DESTDIR)/usr/share/bash-completion/completions/
+ $(INSTALL) -d -m 755 $(DESTDIR)$(datadir)/bash-completion/completions/
$(INSTALL) -m 755 $(VPATH)/bash-completion \
- $(DESTDIR)/usr/share/bash-completion/completions/fwupdate
+ $(DESTDIR)$(datadir)/bash-completion/completions/fwupdate
--- a/linux/fwup.pc.in
+++ b/linux/fwup.pc.in
@@ -1,7 +1,7 @@
-prefix=/usr
-exec_prefix=/usr
+prefix=@@PREFIX@@
+exec_prefix=@@EXEC_PREFIX@@
libdir=@@LIBDIR@@
-includedir=/usr/include
+includedir=@@INCLUDEDIR@@
Name: fwup
Description: Library for deployment of UEFI firmware updates.
--- a/linux/libfwup.c
+++ b/linux/libfwup.c
@@ -35,7 +35,7 @@
#include <dell-wmi-smi.h>
#ifdef FWUPDATE_HAVE_LIBSMBIOS__
-#include </usr/include/smbios_c/token.h>
+#include <smbios_c/token.h>
#include <smbios_c/smi.h>
#endif

17
pkgs/os-specific/linux/libsmbios/default.nix
View File

@ -1,27 +1,25 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, libtool, gettext
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, help2man, gettext
, libxml2, perl, doxygen }:
stdenv.mkDerivation rec {
name = "libsmbios-${version}";
version = "2.3.3";
version = "2.4.1";
src = fetchFromGitHub {
owner = "dell";
repo = "libsmbios";
rev = "v${version}";
sha256 = "1cl5nb6qk8ki87hwqf9n1dd9nlhkjnlpdxlhzvm82za16gs7apkl";
sha256 = "158w5fz777is7nr5yhpr69b17nn6i1pavycxq1q9899frrpkzbsc";
};
nativeBuildInputs = [ autoreconfHook doxygen gettext libtool perl pkgconfig ];
buildInputs = [ libxml2 ];
nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkgconfig ];
configureFlags = [ "--disable-python" "--disable-graphviz" ];
enableParallelBuilding = true;
postInstall =
''
postInstall = ''
mkdir -p $out/include
cp -a src/include/smbios_c $out/include/
cp -a out/public-include/smbios_c $out/include/
@ -29,10 +27,11 @@ stdenv.mkDerivation rec {
preFixup = ''rm -rf "$(pwd)" ''; # Hack to avoid TMPDIR in RPATHs
meta = {
meta = with stdenv.lib; {
homepage = https://github.com/dell/libsmbios;
description = "A library to obtain BIOS information";
license = with stdenv.lib.licenses; [ osl21 gpl2Plus ];
license = with licenses; [ osl21 gpl2Plus ];
maintainers = with maintainers; [ ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

4
pkgs/os-specific/linux/wireguard/default.nix
View File

@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
let
name = "wireguard-${version}";
version = "0.0.20180202";
version = "0.0.20180218";
src = fetchurl {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "ee3415b482265ad9e8721aa746aaffdf311058a2d1a4d80e7b6d11bbbf71c722";
sha256 = "4ac4c4e4ad4dc2cf9dcb831b0cf347567ccea675ca524528cf5a4d9dccb2fe52";
};
meta = with stdenv.lib; {

13
pkgs/servers/mattermost/default.nix
View File

@ -1,8 +1,13 @@
{ stdenv, fetchurl, fetchFromGitHub, buildGoPackage }:
let
version = "4.7.2";
goPackagePath = "github.com/mattermost/mattermost-server";
buildFlags = "-ldflags \"-X '${goPackagePath}/model.BuildNumber=nixpkgs-${version}'\"";
in
buildGoPackage rec {
name = "mattermost-${version}";
version = "4.7.2";
src = fetchFromGitHub {
owner = "mattermost";
@ -16,12 +21,12 @@ buildGoPackage rec {
sha256 = "14gr7zzx77q862qccjcdwrzd6n8g2z8yngw8aa4g3q6hypsqi4v3";
};
goPackagePath = "github.com/mattermost/mattermost-server";
inherit goPackagePath;
buildPhase = ''
runHook preBuild
cd go/src/${goPackagePath}/cmd/platform
go install
go install ${buildFlags}
runHook postBuild
'';
@ -35,7 +40,7 @@ buildGoPackage rec {
'';
meta = with stdenv.lib; {
description = "Open-Source, self-hosted Slack-alternative";
description = "Open-source, self-hosted Slack-alternative";
homepage = https://www.mattermost.org;
license = with licenses; [ agpl3 asl20 ];
maintainers = with maintainers; [ fpletz ryantm ];

4
pkgs/tools/misc/direnv/default.nix
View File

@ -2,14 +2,14 @@
buildGoPackage rec {
name = "direnv-${version}";
version = "2.14.0";
version = "2.15.0";
goPackagePath = "github.com/direnv/direnv";
src = fetchFromGitHub {
owner = "direnv";
repo = "direnv";
rev = "v${version}";
sha256 = "0xgb895dda7q7qyl5lg1jfjfb82daaf133dx0vw8lp7d67xqv9r8";
sha256 = "09mys14acjbrkvjy9zl2k521k3xcs6b0brg8zlhh8qadhbirfkp3";
};
postConfigure = ''

12
pkgs/tools/networking/dnsmasq/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, dbus_libs, nettle, libidn, libnetfilter_conntrack }:
{ stdenv, fetchurl, pkgconfig, dbus_libs, nettle, libidn, libnetfilter_conntrack, fetchpatch }:
with stdenv.lib;
let
@ -18,6 +18,16 @@ stdenv.mkDerivation rec {
sha256 = "0ar5h5v3kas2qx2wgy5iqin15gc4jhqrqs067xacgc3lii1rz549";
};
patches = [
(fetchpatch {
name = "CVE-2017-15107.patch";
url = "http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=4fe6744a220eddd3f1749b40cac3dfc510787de6";
sha256 = "0r8grhh1q46z8v6manx1vvfpf2vmchfzsg7l1djh63b1fy1mbjkk";
# changelog does not apply cleanly but its safe to skip
excludes = [ "CHANGELOG" ];
})
];
preBuild = ''
makeFlagsArray=("COPTS=${copts}")
'';

7
pkgs/tools/system/efibootmgr/default.nix
View File

@ -9,22 +9,21 @@ stdenv.mkDerivation rec {
buildInputs = [ efivar popt ];
src = fetchFromGitHub {
owner = "rhinstaller";
owner = "rhboot";
repo = "efibootmgr";
rev = version;
sha256 = "0z7h1dirp8za6lbbf4f3dzn7l1px891rdymhkbqc10yj6gi1jpqp";
};
NIX_CFLAGS_COMPILE = "-I${efivar}/include/efivar";
makeFlags = [ "EFIDIR=nixos" ];
installFlags = [ "prefix=$(out)" ];
meta = with stdenv.lib; {
description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager";
homepage = https://github.com/rhinstaller/efibootmgr;
homepage = https://github.com/rhboot/efibootmgr;
license = licenses.gpl2;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -19934,6 +19934,8 @@ with pkgs;
cups-toshiba-estudio = callPackage ../misc/cups/drivers/estudio {};
cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { };
crashplan = callPackage ../applications/backup/crashplan { };
crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { inherit (gnome3) gconf; };

4
pkgs/top-level/ocaml-packages.nix
View File

@ -194,9 +194,7 @@ let
then callPackage ../development/ocaml-modules/csv { }
else callPackage ../development/ocaml-modules/csv/1.5.nix { };
curses = callPackage ../development/ocaml-modules/curses {
ncurses = pkgs.ncurses5;
};
curses = callPackage ../development/ocaml-modules/curses { };
custom_printf = callPackage ../development/ocaml-modules/custom_printf { };