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: f7f0678728c4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ffa1088b6cab
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 30, 2017

  1. apitrace: use default Qt5

    @globin
    globin committed Jul 30, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d71f1f9 View commit details

  2. mariadb: fix i686 build

    @globin
    globin committed Jul 30, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6538CB9266B06F31
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ffa1088 View commit details
Showing with 4 additions and 4 deletions.
  1. +3 −3 pkgs/servers/sql/mariadb/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
6 changes: 3 additions & 3 deletions pkgs/servers/sql/mariadb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -128,9 +128,7 @@ everything = stdenv.mkDerivation (common // {
buildInputs = common.buildInputs ++ [
xz lzo lz4 bzip2 snappy
libxml2 boost judy libevent cracklib
]
++ optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ]
;
] ++ optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ];

cmakeFlags = common.cmakeFlags ++ [
"-DMYSQL_DATADIR=/var/lib/mysql"
@@ -164,6 +162,8 @@ everything = stdenv.mkDerivation (common // {
rm -r "$out"/{mysql-test,sql-bench,data} # Don't need testing data
rm "$out"/share/man/man1/mysql-test-run.pl.1
'';

CXXFLAGS = optionalString stdenv.isi686 "-fpermissive";
});


2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -457,7 +457,7 @@ with pkgs;
withGui = false;
};

apitrace = libsForQt56.callPackage ../applications/graphics/apitrace {};
apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {};

argus = callPackage ../tools/networking/argus {};