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: dead7ec1112a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 95419ade3e8b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 5, 2020

  1. modem-manager-gui: Fix build

    Attempt to fix the following issue:
    
    	Running custom install script '/nix/store/9z5fg8ia4lr10nqglk3jlwyd7xcqadzk-meson-0.53.2/bin/meson --internal yelphelper install --subdir=help --id=modem-manager-gui --installdir=share/help --sources=about.page@@contrib-code.page@@contrib-translations.page@@index.page@@license.page@@report-bugs.page@@usage-config.page@@usage-contacts.page@@usage-getinfo.page@@usage-modem.page@@usage-netsearch.page@@usage-sms.page@@usage-traffic.page@@usage-ussd.page --symlinks=true --media=figures/contacts-window.png@@figures/modem-manager-gui-logo.png@@figures/network-info.png@@figures/scan-window.png@@figures/sms-window.png@@figures/traffic-window.png@@figures/ussd-window.png@@figures/startup-window.png'
    	Traceback (most recent call last):
    	  File "/nix/store/0jg6lgd7i6c3y4jjms8j0b0cigij94hn-itstool-2.0.6/bin/itstool", line 1598, in <module>
    	    doc.merge_translations(translations, opts.lang, strict=opts.strict)
    	  File "/nix/store/0jg6lgd7i6c3y4jjms8j0b0cigij94hn-itstool-2.0.6/bin/itstool", line 984, in merge_translations
    	    lcpar = lcpar.parent
    	  File "/nix/store/cp1g6m360dky1baz3x5q5gm92basj7rv-python3-3.7.7-env/lib/python3.7/site-packages/libxml2.py", line 296, in get_parent
    	    return nodeWrap(ret)
    	  File "/nix/store/cp1g6m360dky1baz3x5q5gm92basj7rv-python3-3.7.7-env/lib/python3.7/site-packages/libxml2.py", line 580, in nodeWrap
    	    if name[0:8] == "document":
    	TypeError: 'NoneType' object is not subscriptable
    	[...]
    	Installing /build/hg-archive/build/help/uk/usage-ussd.page to /nix/store/8miw71zkfjqd8z3v5zzp8ybv6pxmc33y-modem-manager-gui-0.0.19.1/share/help/uk/modem-manager-gui/usage-ussd.page
    	Traceback (most recent call last):
    	  File "/nix/store/9z5fg8ia4lr10nqglk3jlwyd7xcqadzk-meson-0.53.2/bin/meson", line 9, in <module>
    	    sys.exit(main())
    	  File "/nix/store/9z5fg8ia4lr10nqglk3jlwyd7xcqadzk-meson-0.53.2/lib/python3.7/site-packages/mesonbuild/mesonmain.py", line 226, in main
    	    return run(sys.argv[1:], launcher)
    	  File "/nix/store/9z5fg8ia4lr10nqglk3jlwyd7xcqadzk-meson-0.53.2/lib/python3.7/site-packages/mesonbuild/mesonmain.py", line 215, in run
    	    return run_script_command(args[1], args[2:])
    	  File "/nix/store/9z5fg8ia4lr10nqglk3jlwyd7xcqadzk-meson-0.53.2/lib/python3.7/site-packages/mesonbuild/mesonmain.py", line 163, in run_script_command
    	    return module.run(script_args)
    	  File "/nix/store/9z5fg8ia4lr10nqglk3jlwyd7xcqadzk-meson-0.53.2/lib/python3.7/site-packages/mesonbuild/scripts/yelphelper.py", line 132, in run
    	    destdir, options.project_id, options.symlinks)
    	  File "/nix/store/9z5fg8ia4lr10nqglk3jlwyd7xcqadzk-meson-0.53.2/lib/python3.7/site-packages/mesonbuild/scripts/yelphelper.py", line 71, in install_help
    	    shutil.copyfile(infile, outfile)
    	  File "/nix/store/vs4vj1yzqj1bkcqkf3b6sxm6jfy1gb4j-python3-3.7.7/lib/python3.7/shutil.py", line 120, in copyfile
    	    with open(src, 'rb') as fsrc:
    	FileNotFoundError: [Errno 2] No such file or directory: '/build/hg-archive/build/help/uk/usage-ussd.page'
    	FAILED: meson-install
    jtojnar committed Apr 5, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    cab404 Cabia Rangris
    Copy the full SHA
    95419ad View commit details
Showing with 9 additions and 0 deletions.
  1. +9 −0 pkgs/applications/networking/modem-manager-gui/default.nix
9 changes: 9 additions & 0 deletions pkgs/applications/networking/modem-manager-gui/default.nix
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, pkgconfig
, python3
, fetchhg
, fetchpatch
, gtk3
, glib
, gdbm
@@ -25,6 +26,14 @@ stdenv.mkDerivation rec {
sha256 = "11iibh36567814h2bz41sa1072b86p1l13xyj670pwkh9k8kw8fd";
};

patches = [
# Fix docs build
(fetchpatch {
url = "https://bitbucket.org/linuxonly/modem-manager-gui/commits/68fb09c12413b7de9b7477cbf4241c3527568325/raw";
sha256 = "58XIT/RTZ9sjUK2e47h+SqpRWhQ2vbKb2h9MKiHNdgw=";
})
];

nativeBuildInputs = [
pkgconfig
python3