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

Commits on Mar 6, 2019

  1. buildGoPackage: update Go to version 1.12

    @kalbasit
    kalbasit committed Mar 6, 2019
    Copy the full SHA
    89da25f View commit details

  2. bettercap: build with Go 1.11

    @kalbasit
    kalbasit committed Mar 6, 2019
    Copy the full SHA
    2e86ada View commit details

  3. deepin: remove the temporary go_1_11 assignment to go

    @kalbasit
    kalbasit committed Mar 6, 2019
    Copy the full SHA
    3a6ba89 View commit details

  4. singularity: remove the temporary go_1_11 assignment to go

    @kalbasit
    kalbasit committed Mar 6, 2019
    Copy the full SHA
    c64eda9 View commit details

  5. mirrorbits: build with Go 1.11

    @kalbasit
    kalbasit committed Mar 6, 2019
    Copy the full SHA
    ee81ceb View commit details

  6. miniflux: build with Go 1.11

    @kalbasit
    kalbasit committed Mar 6, 2019
    Copy the full SHA
    340a3db View commit details

  7. mongodb-tools: build with Go 1.11

    @kalbasit
    kalbasit committed Mar 6, 2019
    Copy the full SHA
    889f2fc View commit details

  8. packetbeat5: build with Go 1.11

    @kalbasit
    kalbasit committed Mar 6, 2019
    Copy the full SHA
    985ce23 View commit details

  9. packetbeat6: build with Go 1.11

    @kalbasit
    kalbasit committed Mar 6, 2019
    Copy the full SHA
    3c8caeb View commit details

  10. coackroachdb: build with Go 1.11

    @kalbasit
    kalbasit committed Mar 6, 2019
    Copy the full SHA
    205ccb4 View commit details

  11. skydive: build with Go 1.11

    @kalbasit
    kalbasit committed Mar 6, 2019
    Copy the full SHA
    c219411 View commit details

Commits on Mar 10, 2019

  1. Merge #56927: buildGoPackage: 1.11 -> 1.12 (into staging)

    @vcunat
    vcunat committed Mar 10, 2019
    Copy the full SHA
    a2eb06a View commit details
Showing with 48 additions and 23 deletions.
  1. +3 −9 pkgs/desktops/deepin/default.nix
  2. +45 −14 pkgs/top-level/all-packages.nix
12 changes: 3 additions & 9 deletions pkgs/desktops/deepin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
{ pkgs, makeScope, libsForQt5, go_1_11 }:
{ pkgs, makeScope, libsForQt5 }:

let
packages = self: with self; {
updateScript = callPackage ./update.nix { };

dbus-factory = callPackage ./dbus-factory { };
dde-api = callPackage ./dde-api {
# XXX: the build is finding references to Go when compiled with go v1.12
go = go_1_11;
};
dde-api = callPackage ./dde-api { };
dde-calendar = callPackage ./dde-calendar { };
dde-daemon = callPackage ./dde-daemon {
# XXX: the build is finding references to Go when compiled with go v1.12
go = go_1_11;
};
dde-daemon = callPackage ./dde-daemon { };
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
dde-session-ui = callPackage ./dde-session-ui { };
deepin-desktop-base = callPackage ./deepin-desktop-base { };
59 changes: 45 additions & 14 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -924,7 +924,11 @@ in

bchunk = callPackage ../tools/cd-dvd/bchunk { };

inherit (callPackages ../misc/logging/beats/6.x.nix { })
inherit (callPackages ../misc/logging/beats/6.x.nix {
# XXX: bettercap is failing with Go 1.12. Error is related to cgo, an
# update to this package might fix it.
buildGoPackage = buildGo111Package;
})
filebeat6
heartbeat6
metricbeat6
@@ -936,7 +940,11 @@ in
metricbeat = metricbeat6;
packetbeat = packetbeat6;

inherit (callPackages ../misc/logging/beats/5.x.nix { })
inherit (callPackages ../misc/logging/beats/5.x.nix {
# XXX: bettercap is failing with Go 1.12. Error is related to cgo, an
# update to this package might fix it.
buildGoPackage = buildGo111Package;
})
filebeat5
heartbeat5
metricbeat5
@@ -1711,7 +1719,11 @@ in

mongodb-compass = callPackage ../tools/misc/mongodb-compass { };

mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
mongodb-tools = callPackage ../tools/misc/mongodb-tools {
# XXX: bettercap is failing with Go 1.12. Error is related to cgo, an
# update to this package might fix it.
buildGoPackage = buildGo111Package;
};

mozlz4a = callPackage ../tools/compression/mozlz4a { };

@@ -1792,7 +1804,11 @@ in

bepasty = callPackage ../tools/misc/bepasty { };

bettercap = callPackage ../tools/security/bettercap { };
bettercap = callPackage ../tools/security/bettercap {
# XXX: bettercap is failing with Go 1.12. Error is related to cgo, an
# update to this package might fix it.
buildGoPackage = buildGo111Package;
};

bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner;

@@ -4263,7 +4279,11 @@ in

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

mirrorbits = callPackage ../servers/mirrorbits { };
mirrorbits = callPackage ../servers/mirrorbits {
# XXX: bettercap is failing with Go 1.12. Error is related to cgo, an
# update to this package might fix it.
buildGoPackage = buildGo111Package;
};

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

@@ -12605,7 +12625,11 @@ in
sdnotify-wrapper = callPackage ../os-specific/linux/sdnotify-wrapper { };
};

skydive = callPackage ../tools/networking/skydive { };
skydive = callPackage ../tools/networking/skydive {
# XXX: bettercap is failing with Go 1.12. Error is related to cgo, an
# update to this package might fix it.
buildGoPackage = buildGo111Package;
};

slang = callPackage ../development/libraries/slang { };

@@ -13341,8 +13365,11 @@ in
buildGo111Package = callPackage ../development/go-modules/generic {
go = buildPackages.go_1_11;
};
buildGo112Package = callPackage ../development/go-modules/generic {
go = buildPackages.go_1_12;
};

buildGoPackage = buildGo111Package;
buildGoPackage = buildGo112Package;

go2nix = callPackage ../development/tools/go2nix { };

@@ -13913,7 +13940,10 @@ in

mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };

miniflux = callPackage ../servers/miniflux { };
miniflux = callPackage ../servers/miniflux {
# XXX: bettercap is failing with Go 1.12.
buildGoPackage = buildGo111Package;
};

nagios = callPackage ../servers/monitoring/nagios { };

@@ -14379,7 +14409,11 @@ in

cifs-utils = callPackage ../os-specific/linux/cifs-utils { };

cockroachdb = callPackage ../servers/sql/cockroachdb { };
cockroachdb = callPackage ../servers/sql/cockroachdb {
# XXX: bettercap is failing with Go 1.12. Error is related to cgo, an
# update to this package might fix it.
buildGoPackage = buildGo111Package;
};

conky = callPackage ../os-specific/linux/conky ({
lua = lua5_3_compat;
@@ -17695,10 +17729,7 @@ in

slack-term = callPackage ../applications/networking/instant-messengers/slack-term { };

singularity = callPackage ../applications/virtualization/singularity {
# XXX: the build is finding references to Go when compiled with go v1.12
go = go_1_11;
};
singularity = callPackage ../applications/virtualization/singularity { };

spectmorph = callPackage ../applications/audio/spectmorph { };

@@ -21328,7 +21359,7 @@ in
clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { };

deepin = recurseIntoAttrs (import ../desktops/deepin {
inherit pkgs libsForQt5 go_1_11;
inherit pkgs libsForQt5;
inherit (lib) makeScope;
});