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: 69d75ce207fc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f969b1c816e7
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Feb 27, 2017

  1. fwupd: Fix localstatedir 

    (cherry picked from commit e292d16)
    @shlevy @globin
    shlevy authored and globin committed Feb 27, 2017

    Partially verified

    This commit is signed with the committer’s verified signature.
    globin’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    1ad7e1d View commit details

  2. haskell: ghc710x packages: remove obsolete configurations 

    (cherry picked from commit 172a2bb)
    @ljli @globin
    ljli authored and globin committed Feb 27, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    globin Robin Gloster
    GPG key ID: 5E4C836C632C2882
    Verified
    Learn about vigilant mode
    Copy the full SHA
    919bc48 View commit details

  3. haskell: add semigroups dependency to Quickcheck for GHC < 8 

    (cherry picked from commit 1aa6d77)
    @ljli @globin
    ljli authored and globin committed Feb 27, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    globin Robin Gloster
    GPG key ID: 5E4C836C632C2882
    Verified
    Learn about vigilant mode
    Copy the full SHA
    13d29e7 View commit details

  4. haskell: break dependency cycle between QuickCheck and semigroups for… 

    … GHC < 8

The cycle:
QuickCheck -> semigroups
semigroups -> hashable
semigroups -> unordered-containers
unordered-containers -> hashable
unordered-containers -> QuickCheck # test suite only
hashable -> QuickCheck # test suite only

(cherry picked from commit 24c9361)
    @ljli @globin
    ljli authored and globin committed Feb 27, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    globin Robin Gloster
    GPG key ID: 5E4C836C632C2882
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1e72bec View commit details

  5. haskell: add semigroups dependency to optparse-applicative for GHC < 8 

    (cherry picked from commit 386ddc7)
    @ljli @globin
    ljli authored and globin committed Feb 27, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    globin Robin Gloster
    GPG key ID: 5E4C836C632C2882
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f969b1c View commit details
10 changes: 6 additions & 4 deletions pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View file
Original file line number Diff line number Diff line change
@@ -182,28 +182,30 @@ self: super: {
# https://github.com/well-typed/hackage-security/issues/158
hackage-security = dontHaddock (dontCheck super.hackage-security);

# Breaks a dependency cycle between QuickCheck and semigroups
hashable = dontCheck super.hashable;
unordered-containers = dontCheck super.unordered-containers;

# GHC versions prior to 8.x require additional build inputs.
distributive = addBuildDepend super.distributive self.semigroups;
mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]);
Glob = addBuildDepends super.Glob (with self; [semigroups]);
Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]);
aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale";
aeson_0_11_2_0 = disableCabalFlag (addBuildDepend super.aeson_0_11_2_0 self.semigroups) "old-locale";
bytes = addBuildDepend super.bytes self.doctest;
case-insensitive = addBuildDepend super.case-insensitive self.semigroups;
hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; });
hslogger = addBuildDepend super.hslogger self.HUnit;
intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]);
lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
semigroups_0_18_1 = addBuildDepends 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 ]; });
# cereal must have `fail` in pre-ghc-8.0.x versions
# also tests require bytestring>=0.10.8.1
cereal = dontCheck (addBuildDepend super.cereal self.fail);
cereal_0_5_2_0 = dontCheck (addBuildDepend super.cereal_0_5_2_0 self.fail);

# Moved out from common as no longer the case for GHC8
ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; };
4 changes: 3 additions & 1 deletion pkgs/os-specific/linux/firmware/fwupd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,8 @@ let version = "0.8.1"; in
polkit gcab appstream-glib gusb sqlite libarchive libsoup
docbook2x libxslt libelf libsmbios fwupdate libyaml valgrind
];
patchPhase = ''
patches = [ ./localstatedir-check-perms.patch ];
postPatch = ''
sed -i -e \
's|/usr/bin/gpgme-config|${gpgme.dev}/bin/gpgme-config|' -e \
's|/usr/bin/gpg-error-config|${libgpgerror.dev}/bin/gpg-error-config|' \
@@ -27,6 +28,7 @@ let version = "0.8.1"; in
configureFlags =
[ "--with-systemdunitdir=$(out)/lib/systemd/system"
"--with-udevrulesdir=$(out)/lib/udev/rules.d"
"--localstatedir=/var"
];
enableParallelBuilding = true;
meta =
12 changes: 12 additions & 0 deletions pkgs/os-specific/linux/firmware/fwupd/localstatedir-check-perms.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -Naur fwupd-0.8.1-orig/src/Makefile.in fwupd-0.8.1/src/Makefile.in
--- fwupd-0.8.1-orig/src/Makefile.in 2017-02-24 02:59:23.000000000 -0500
+++ fwupd-0.8.1/src/Makefile.in 2017-02-27 15:06:56.218901891 -0500
@@ -1639,7 +1639,7 @@
$(srcdir)/fwupd.gresource.xml

install-data-hook:
- if test -w $(DESTDIR)$(prefix)/; then \
+ if test -w $$(dirname $(DESTDIR)$(localstatedir)/); then \
mkdir -p $(DESTDIR)$(localstatedir)/lib/fwupd; \
chmod 0755 $(DESTDIR)$(localstatedir)/lib/fwupd; \
mkdir -p $(DESTDIR)$(localstatedir)/cache/app-info/xmls; \