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

Commits on Jun 14, 2019

  1. fuse,fuse3: Avoid unnecessary build warnings 

    Do not set FUSERMOUNT_DIR since we already set it though
NIX_CFLAGS_COMPILE.

Setting it twice results in a lot of warnings like this one:

<command-line>:0:0: warning: "FUSERMOUNT_DIR" redefined

which makes the build look potentially broken.
This doesn't affect the result but fuse3 will now build without any
warnings and building fuse yields less warnings.
    @primeos
    primeos committed Jun 14, 2019
    Copy the full SHA
    f2cfc15 View commit details

  2. tdesktop: Update the Arch patches for a HiDPI fix 

    See: https://bugs.archlinux.org/task/62594
    @primeos
    primeos committed Jun 14, 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
    7e2dc8d View commit details

  3. gns3Packages.{server,gui}Stable: 2.1.20 -> 2.1.21

    @primeos
    primeos committed Jun 14, 2019
    Copy the full SHA
    371ce92 View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/networking/gns3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ callPackage, stdenv }:

let
stableVersion = "2.1.20";
stableVersion = "2.1.21";
previewVersion = "2.2.0b2";
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview";
in args // { inherit version branch; };
mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
guiSrcHash = "0hs4qxas8xfwpn8c0w1l89aypqj3dy5wskyis8dq08p6h3kjis1g";
serverSrcHash = "06q5283mdafijbczd14whw8fqwhmkvvaa9r7q16m18d96mr1z8m5";
guiSrcHash = "1ydmib302r1cpm2z9pzsfp4ygxrbmskwszsip397n92qx3l9a9v3";
serverSrcHash = "1ahn1xq1f0wx46i0c8idz96dxfbakk37pqi6amy91594mdlp8yr4";
in {
guiStable = mkGui {
stable = true;
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,8 +7,8 @@ let
version = "1.7.7";
sha256Hash = "0w3jq02qzpx58xlmwaj0lgav5lx6s9hdidnq9v1npp4qmpdnsn75";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
archPatchesRevision = "476826";
archPatchesHash = "1vnlvba60hxd5jlh0fvsa50xmb9xgcphdsx6j1ld7f12m7ik68zr";
archPatchesRevision = "480743";
archPatchesHash = "0jfyp642l2850yzgrw3irq8bn6vl44rx2693c5cshwbihd212af7";
};
in {
stable = mkTelegram stableVersion;
4 changes: 3 additions & 1 deletion pkgs/os-specific/linux/fuse/common.nix
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,9 @@ in stdenv.mkDerivation rec {
url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";
sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa";
})
++ stdenv.lib.optional isFuse3 ./fuse3-install.patch;
++ (if isFuse3
then [ ./fuse3-install.patch ./fuse3-Do-not-set-FUSERMOUNT_DIR.patch ]
else [ ./fuse2-Do-not-set-FUSERMOUNT_DIR.patch ]);

nativeBuildInputs = if isFuse3
then [ meson ninja pkgconfig ]
11 changes: 11 additions & 0 deletions pkgs/os-specific/linux/fuse/fuse2-Do-not-set-FUSERMOUNT_DIR.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in

AUTOMAKE_OPTIONS = subdir-objects
-AM_CPPFLAGS = -I$(top_srcdir)/include -DFUSERMOUNT_DIR=\"$(bindir)\" \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
-D_FILE_OFFSET_BITS=64 -D_REENTRANT -DFUSE_USE_VERSION=26

lib_LTLIBRARIES = libfuse.la libulockmgr.la
12 changes: 12 additions & 0 deletions pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -36,8 +36,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(),
soversion: '3', include_directories: include_dirs,
dependencies: deps, install: true,
link_depends: 'fuse_versionscript',
- c_args: [ '-DFUSE_USE_VERSION=34',
- '-DFUSERMOUNT_DIR="@0@"'.format(fusermount_path) ],
+ c_args: [ '-DFUSE_USE_VERSION=34' ],
link_args: ['-Wl,--version-script,' + meson.current_source_dir()
+ '/fuse_versionscript' ])