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: a823616723c4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5c780036c595
Choose a head ref

Commits on Dec 5, 2019

  1. azpainter: 2.1.4 -> 2.1.5

    dtzWill committed Dec 5, 2019
    Copy the full SHA
    e90bef2 View commit details

Commits on Dec 6, 2019

  1. meson-tools: init at 0.1

    lopsided98 committed Dec 6, 2019
    Copy the full SHA
    593fbef View commit details
  2. armTrustedFirmwareTools: init

    This package currently contains fiptool, cert_create and sptool.
    lopsided98 committed Dec 6, 2019
    Copy the full SHA
    b5ec2b5 View commit details
  3. armTrustedFirmwareS905: init

    This supports the Amlogic S905, otherwise known as Meson GXBB.
    lopsided98 committed Dec 6, 2019
    Copy the full SHA
    d00a38a View commit details
  4. ubootOdroidC2: init

    lopsided98 committed Dec 6, 2019
    Copy the full SHA
    8845809 View commit details
  5. Copy the full SHA
    7486e0a View commit details
  6. plplot: init at 5.15.0

    bcdarwin committed Dec 6, 2019
    Copy the full SHA
    e85fe01 View commit details

Commits on Dec 22, 2019

  1. nixos/tests/user-account: add static uid for alice

    A lot of tests assume that the alice user
    will have a uid of 1000. Let's make that
    a guarantee and be able to reference this value.
    worldofpeace committed Dec 22, 2019
    Copy the full SHA
    e2ea815 View commit details
  2. nixosTests.gnome3-xorg: port to python/rewrite

    We've rewritten it use GDM, and we can now autologin
    to the X11 session because of the accountsservice preStart
    script for autologin. It should work similar to how the wayland
    test works, just with a few nuanced differences for xorg.
    worldofpeace committed Dec 22, 2019
    Copy the full SHA
    228818c View commit details

Commits on Dec 23, 2019

  1. elisa: 0.4.2 -> 19.12.0

    r-ryantm committed Dec 23, 2019
    Copy the full SHA
    a90f5b5 View commit details

Commits on Dec 24, 2019

  1. qjackctl: 0.6.0 -> 0.6.1

    r-ryantm committed Dec 24, 2019
    Copy the full SHA
    3c71b70 View commit details
  2. Copy the full SHA
    f85ec2d View commit details

Commits on Jan 2, 2020

  1. flyway: fix jarDirs option

    this is not a system property, but rather an argument to
    org.flaywaydb.commandline.Main.main().  therefore, it must come after,
    rather than before, the name of the main class.  (otherwise it's
    interpreted as an argument to the VM itself.)
    
    flyway also expects the option and value to be separated by '=', not ' '.
    
    follows on to #76094
    jerith666 committed Jan 2, 2020
    Copy the full SHA
    2867d19 View commit details

Commits on Jan 3, 2020

  1. Copy the full SHA
    69827da View commit details

Commits on Jan 4, 2020

  1. Copy the full SHA
    888290d View commit details
  2. Copy the full SHA
    ea89d56 View commit details

Commits on Jan 5, 2020

  1. lib/modules: clarify error message of 'assigning to top-level attribute'

    If I understand correctly, the problem isn't so much that you're assigning to
    that top-level attribute, but that the assignment to the attribute (or any
    child of the attribute) introduces the 'config' object and prevents 'lifting'
    all settings to a generated 'config' object.
    raboof committed Jan 5, 2020
    Copy the full SHA
    43ef3a8 View commit details
  2. greybird: 3.22.10 -> 3.22.11

    - update to version 3.22.11
    - build system ported to meson
    romildo committed Jan 5, 2020
    Copy the full SHA
    7d01524 View commit details

Commits on Jan 6, 2020

  1. pounce: init at 1.0p1

    edef1c committed Jan 6, 2020
    Copy the full SHA
    2a06e15 View commit details
  2. Copy the full SHA
    fa28442 View commit details
  3. catch2: 2.11.0 -> 2.11.1

    r-ryantm committed Jan 6, 2020
    Copy the full SHA
    9d5dbf4 View commit details
  4. dbeaver: 6.3.1 -> 6.3.2

    jojosch committed Jan 6, 2020
    Copy the full SHA
    3a1709d View commit details
  5. Copy the full SHA
    7878ac6 View commit details
  6. Copy the full SHA
    b656da1 View commit details
  7. global: 6.6.3 -> 6.6.4

    r-ryantm committed Jan 6, 2020
    Copy the full SHA
    885fb1b View commit details
  8. Copy the full SHA
    1b40648 View commit details
  9. Copy the full SHA
    60fcf7a View commit details
  10. gnucash: 3.7 -> 3.8b

    r-ryantm committed Jan 6, 2020
    Copy the full SHA
    289eebc View commit details
  11. Copy the full SHA
    29802ae View commit details
  12. gnunet: 0.12.0 -> 0.12.1

    r-ryantm committed Jan 6, 2020
    Copy the full SHA
    4d4add5 View commit details
  13. nginx-sso: 0.22.0 -> 0.23.0

    bbigras committed Jan 6, 2020
    Copy the full SHA
    85cdf5f View commit details
  14. log4cplus: 2.0.4 -> 2.0.5

    r-ryantm committed Jan 6, 2020
    Copy the full SHA
    183dddf View commit details
  15. Copy the full SHA
    897cc91 View commit details
  16. perlPackages.EmailSender: Fix for macOS

    Use shortenPerlShebang to avoid the limit macOS puts on the length of
    shebang.
    hamishmack committed Jan 6, 2020
    Copy the full SHA
    940c46a View commit details
  17. Copy the full SHA
    d474fc6 View commit details

Commits on Jan 7, 2020

  1. kdevelop: 5.4.5 -> 5.4.6

    aanderse committed Jan 7, 2020
    Copy the full SHA
    a8db490 View commit details
  2. kdev-php: 5.4.5 -> 5.4.6

    aanderse committed Jan 7, 2020
    Copy the full SHA
    3980119 View commit details
  3. kdev-python: 5.4.5 -> 5.4.6

    aanderse committed Jan 7, 2020
    Copy the full SHA
    c6b8d79 View commit details
  4. Copy the full SHA
    42a0d7f View commit details
  5. Copy the full SHA
    f829159 View commit details
  6. picolisp: 19.6 -> 19.12

    r-ryantm committed Jan 7, 2020
    Copy the full SHA
    1edb9dc View commit details
  7. Copy the full SHA
    fea2951 View commit details
  8. Copy the full SHA
    2a4de15 View commit details
  9. Copy the full SHA
    110ea2f View commit details
  10. dune_2: 2.1.0 -> 2.1.1

    marsam committed Jan 7, 2020
    Copy the full SHA
    d465a40 View commit details
  11. buildRustCrate: add buildTests flag to tell rustc to build tests in…

    …stead of binaries
    
    This helps us instruct rustc to build tests instead of binaries. The
    actual build will then ONLY produce test executables. This is a first
    step towards having rust crate tests within nixpkgs.
    
    We default back to only a single output in test cases since that is the
    only reasonable thing to do here.
    
    Producing libraries or binaries in addition to tests would theoretically
    be feasible but usually generates different dependency trees. It is very
    common to have some libraries in `[dev-depdendencies]` within Cargo.toml
    just for your tests. To not start mixing things up going with a
    dedicated derivation for the test build sounds like the best choice for
    now.
    
    To use this you must provide a proper test dependency chain to
    `buildRustCrate` (as you would usually do with your non-test inputs).
    And then set the `buildTests` attribute to `true`. The derivation will
    then contain all tests that were built in `$out/tests`. All common test
    patterns and directories should be supported and tested by this change.
    
    Below is an example how you would run a single test from the derivation.
    This commit contains some more examples in the `buildRustCrateTests`
    attribute set that might be helpful.
    
    ```
    let
      drv = buildRustCrate {
         …
         buildTests true;
      };
    in runCommand "test-my-crate" {} ''
      touch $out
      exec ${drv}/tests/my-test
    ''
    ```
    andir committed Jan 7, 2020
    Copy the full SHA
    a3a5176 View commit details
  12. buildRustCrate: slight "rewording" and reformatting

    There is no point in reinventinb builtins through `filterAttrs` or the
    like. Lets just stick to what we already have in our toolbelt.
    andir committed Jan 7, 2020
    Copy the full SHA
    3e61906 View commit details
  13. Copy the full SHA
    71a96b2 View commit details
  14. gscan2pdf: 2.6.2 -> 2.6.3

    pacien committed Jan 7, 2020
    Copy the full SHA
    a6608d5 View commit details
  15. conmon: v2.0.8 -> v2.0.9

    Signed-off-by: Sascha Grunert <sgrunert@suse.com>
    saschagrunert committed Jan 7, 2020
    Copy the full SHA
    d4a9b0a View commit details
Showing with 9,429 additions and 5,933 deletions.
  1. +1 −0 .github/CODEOWNERS
  2. +3 −0 doc/languages-frameworks/python.section.md
  3. +1 −1 lib/modules.nix
  4. +12 −0 maintainers/maintainer-list.nix
  5. +34 −0 nixos/doc/manual/release-notes/rl-2003.xml
  6. +1 −0 nixos/tests/common/user-account.nix
  7. +58 −20 nixos/tests/gnome3-xorg.nix
  8. +2 −2 pkgs/applications/audio/elisa/default.nix
  9. +2 −2 pkgs/applications/audio/pulseeffects/default.nix
  10. +2 −2 pkgs/applications/audio/qjackctl/default.nix
  11. +2 −2 pkgs/applications/blockchains/ledger-live-desktop/default.nix
  12. +142 −102 pkgs/applications/editors/emacs-modes/elpa-generated.nix
  13. +5,550 −3,578 pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
  14. +2 −2 pkgs/applications/editors/kdevelop5/kdev-php.nix
  15. +2 −2 pkgs/applications/editors/kdevelop5/kdev-python.nix
  16. +2 −2 pkgs/applications/editors/kdevelop5/kdevelop.nix
  17. +2 −2 pkgs/applications/editors/neovim/neovim-remote.nix
  18. +1 −1 pkgs/applications/editors/neovim/wrapper.nix
  19. +2 −2 pkgs/applications/editors/quilter/default.nix
  20. +2 −2 pkgs/applications/graphics/azpainter/default.nix
  21. +2 −2 pkgs/applications/graphics/gscan2pdf/default.nix
  22. +2 −2 pkgs/applications/graphics/photoqt/default.nix
  23. +2 −2 pkgs/applications/misc/dbeaver/default.nix
  24. +2 −2 pkgs/applications/misc/gallery-dl/default.nix
  25. +2 −2 pkgs/applications/misc/heimer/default.nix
  26. +2 −2 pkgs/applications/misc/josm/default.nix
  27. +4 −5 pkgs/applications/misc/keepassx/community.nix
  28. +2 −2 pkgs/applications/misc/latte-dock/default.nix
  29. +385 −385 pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
  30. +385 −385 pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
  31. +385 −385 pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
  32. +14 −3 pkgs/applications/networking/browsers/firefox/common.nix
  33. +0 −100 pkgs/applications/networking/browsers/firefox/fix-ff71-lto.patch
  34. +4 −4 pkgs/applications/networking/browsers/firefox/packages.nix
  35. +4 −2 pkgs/applications/networking/instant-messengers/quaternion/default.nix
  36. +2 −2 pkgs/applications/networking/p2p/gnunet/default.nix
  37. +2 −2 pkgs/applications/office/gnucash/default.nix
  38. +54 −0 pkgs/applications/office/tusk/default.nix
  39. +108 −0 pkgs/applications/science/biology/blast/default.nix
  40. +184 −0 pkgs/applications/science/biology/blast/no_slash_bin.patch
  41. +2 −2 pkgs/applications/science/math/geogebra/default.nix
  42. +3 −3 pkgs/applications/version-management/cvs-fast-export/default.nix
  43. +2 −2 pkgs/applications/virtualization/conmon/default.nix
  44. +2 −2 pkgs/applications/virtualization/podman/default.nix
  45. +30 −4 pkgs/build-support/rust/build-rust-crate/build-crate.nix
  46. +30 −14 pkgs/build-support/rust/build-rust-crate/default.nix
  47. +21 −2 pkgs/build-support/rust/build-rust-crate/install-crate.nix
  48. +24 −3 pkgs/build-support/rust/build-rust-crate/lib.sh
  49. +108 −11 pkgs/build-support/rust/build-rust-crate/test/default.nix
  50. +8 −9 pkgs/data/themes/greybird/default.nix
  51. +8 −0 pkgs/desktops/deepin/dde-control-center/default.nix
  52. +9 −1 pkgs/desktops/deepin/dde-dock/default.nix
  53. +9 −2 pkgs/desktops/deepin/dde-file-manager/default.nix
  54. +10 −1 pkgs/desktops/deepin/dde-launcher/default.nix
  55. +10 −2 pkgs/desktops/deepin/dde-session-ui/default.nix
  56. +1 −0 pkgs/desktops/deepin/default.nix
  57. +136 −0 pkgs/desktops/deepin/startdde/default.nix
  58. +30 −0 pkgs/desktops/deepin/startdde/deps.nix
  59. +7 −0 pkgs/desktops/gnustep/base/default.nix
  60. +2 −2 pkgs/desktops/mate/engrampa/default.nix
  61. +4 −8 pkgs/desktops/pantheon/apps/elementary-files/default.nix
  62. +3 −3 pkgs/desktops/pantheon/desktop/gala/default.nix
  63. +1 −1 pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex
  64. +2 −2 pkgs/development/interpreters/picolisp/default.nix
  65. +21 −0 pkgs/development/interpreters/python/hooks/default.nix
  66. +15 −0 pkgs/development/interpreters/python/hooks/egg-build-hook.sh
  67. +21 −0 pkgs/development/interpreters/python/hooks/egg-install-hook.sh
  68. +17 −0 pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh
  69. +5 −0 pkgs/development/interpreters/python/mk-python-derivation.nix
  70. +512 −508 pkgs/development/interpreters/wasmtime/cargo-lock.patch
  71. +7 −7 pkgs/development/interpreters/wasmtime/default.nix
  72. +2 −2 pkgs/development/libraries/catch2/default.nix
  73. +2 −2 pkgs/development/libraries/log4cplus/default.nix
  74. +2 −2 pkgs/development/libraries/nss/default.nix
  75. +25 −0 pkgs/development/libraries/plplot/default.nix
  76. +11 −2 pkgs/development/libraries/tpm2-tss/default.nix
  77. +14 −2 pkgs/development/ocaml-modules/lwt/ppx.nix
  78. +3 −1 pkgs/development/ocaml-modules/rresult/default.nix
  79. +2 −2 pkgs/development/python-modules/awkward/default.nix
  80. +2 −2 pkgs/development/python-modules/aws-adfs/default.nix
  81. +20 −0 pkgs/development/python-modules/crc32c/default.nix
  82. +2 −2 pkgs/development/python-modules/croniter/default.nix
  83. +2 −2 pkgs/development/python-modules/pikepdf/default.nix
  84. +2 −5 pkgs/development/python-modules/pyramid/default.nix
  85. +33 −0 pkgs/development/python-modules/pysnooper/default.nix
  86. +32 −0 pkgs/development/python-modules/python-toolbox/default.nix
  87. +2 −2 pkgs/development/python-modules/s3fs/default.nix
  88. +2 −2 pkgs/development/python-modules/uncompyle6/default.nix
  89. +2 −3 pkgs/development/python-modules/xdis/default.nix
  90. +26 −0 pkgs/development/python-modules/xmodem/default.nix
  91. +2 −2 pkgs/development/tools/database/schemaspy/default.nix
  92. +2 −2 pkgs/development/tools/flyway/default.nix
  93. +6 −1 pkgs/development/tools/git-series/default.nix
  94. +2 −2 pkgs/development/tools/heroku/default.nix
  95. +6 −6 pkgs/development/tools/jazzy/Gemfile.lock
  96. +12 −12 pkgs/development/tools/jazzy/gemset.nix
  97. +3 −3 pkgs/development/tools/lazygit/default.nix
  98. +2 −2 pkgs/development/tools/misc/clojure-lsp/default.nix
  99. +2 −2 pkgs/development/tools/misc/global/default.nix
  100. +2 −2 pkgs/development/tools/ocaml/dune/2.nix
  101. +133 −133 pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch
  102. +3 −3 pkgs/development/tools/wasm-bindgen-cli/default.nix
  103. +2 −2 pkgs/development/web/nodejs/v12.nix
  104. +3 −5 pkgs/development/web/nodejs/v13.nix
  105. +32 −7 pkgs/misc/arm-trusted-firmware/default.nix
  106. +27 −0 pkgs/misc/meson-tools/default.nix
  107. +56 −3 pkgs/misc/uboot/default.nix
  108. +0 −3 pkgs/misc/vim-plugins/overrides.nix
  109. +0 −23 pkgs/misc/vim-plugins/vim-terraform-fix-event.patch
  110. +8 −15 pkgs/misc/vim-plugins/vim-utils.nix
  111. +1 −0 pkgs/os-specific/darwin/apple-sdk/frameworks.nix
  112. +2 −2 pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
  113. +2 −2 pkgs/os-specific/linux/google-authenticator/default.nix
  114. +1 −1 pkgs/os-specific/linux/kernel/linux-libre.nix
  115. +35 −0 pkgs/servers/http/apache-modules/mod_ca/default.nix
  116. +24 −0 pkgs/servers/http/apache-modules/mod_crl/default.nix
  117. +41 −0 pkgs/servers/http/apache-modules/mod_csr/default.nix
  118. +66 −0 pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h
  119. +24 −0 pkgs/servers/http/apache-modules/mod_ocsp/default.nix
  120. +24 −0 pkgs/servers/http/apache-modules/mod_pkcs12/default.nix
  121. +41 −0 pkgs/servers/http/apache-modules/mod_scep/default.nix
  122. +66 −0 pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h
  123. +24 −0 pkgs/servers/http/apache-modules/mod_spkac/default.nix
  124. +24 −0 pkgs/servers/http/apache-modules/mod_timestamp/default.nix
  125. +0 −31 pkgs/servers/monitoring/facette/default.nix
  126. +2 −2 pkgs/servers/nginx-sso/default.nix
  127. +48 −0 pkgs/servers/pounce/default.nix
  128. +2 −2 pkgs/servers/search/solr/8.x.nix
  129. +4 −4 pkgs/shells/nushell/default.nix
  130. +2 −2 pkgs/tools/admin/swiftclient/default.nix
  131. +2 −2 pkgs/tools/filesystems/reiser4progs/default.nix
  132. +4 −3 pkgs/tools/graphics/gnuplot/default.nix
  133. +4 −4 pkgs/tools/misc/fselect/default.nix
  134. +2 −2 pkgs/tools/misc/parallel/default.nix
  135. +5 −4 pkgs/tools/misc/termplay/default.nix
  136. +3 −3 pkgs/tools/misc/topgrade/default.nix
  137. +3 −3 pkgs/tools/package-management/disnix/default.nix
  138. +1 −0 pkgs/top-level/aliases.nix
  139. +36 −4 pkgs/top-level/all-packages.nix
  140. +4 −0 pkgs/top-level/perl-packages.nix
  141. +9 −1 pkgs/top-level/python-packages.nix
  142. +6 −4 pkgs/top-level/release.nix
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -82,6 +82,7 @@

# Rust
/pkgs/development/compilers/rust @Mic92 @LnL7
/pkgs/build-support/rust @andir

# Darwin-related
/pkgs/stdenv/darwin @NixOS/darwin-maintainers
3 changes: 3 additions & 0 deletions doc/languages-frameworks/python.section.md
Original file line number Diff line number Diff line change
@@ -821,6 +821,9 @@ should be used with `ignoreCollisions = true`.
The following are setup hooks specifically for Python packages. Most of these are
used in `buildPythonPackage`.

- `eggUnpackhook` to move an egg to the correct folder so it can be installed with the `eggInstallHook`
- `eggBuildHook` to skip building for eggs.
- `eggInstallHook` to install eggs.
- `flitBuildHook` to build a wheel using `flit`.
- `pipBuildHook` to build a wheel using `pip` and PEP 517. Note a build system (e.g. `setuptools` or `flit`) should still be added as `nativeBuildInput`.
- `pipInstallHook` to install wheels.
2 changes: 1 addition & 1 deletion lib/modules.nix
Original file line number Diff line number Diff line change
@@ -123,7 +123,7 @@ rec {
if m ? config || m ? options then
let badAttrs = removeAttrs m ["_file" "key" "disabledModules" "imports" "options" "config" "meta"]; in
if badAttrs != {} then
throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'. This is caused by assignments to the top-level attributes `config' or `options'."
throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'. This is caused by introducing a top-level `config' or `options' attribute. Add configuration attributes immediately on the top level instead, or move all of them (namely: ${toString (attrNames badAttrs)}) into the explicit `config' attribute."
else
{ _file = m._file or file;
key = toString m.key or key;
12 changes: 12 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -1764,6 +1764,12 @@
githubId = 11946442;
name = "Dipin Hora";
};
dirkx = {
email = "dirkx@webweaving.org";
github = "dirkx";
githubId = 392583;
name = "Dirk-Willem van Gulik";
};
disassembler = {
email = "disasm@gmail.com";
github = "disassembler";
@@ -1983,6 +1989,12 @@
githubId = 50854;
name = "edef";
};
emantor = {
email = "rouven+nixos@czerwinskis.de";
github = "emantor";
githubId = 934284;
name = "Rouven Czerwinski";
};
embr = {
email = "hi@liclac.eu";
github = "liclac";
34 changes: 34 additions & 0 deletions nixos/doc/manual/release-notes/rl-2003.xml
Original file line number Diff line number Diff line change
@@ -357,6 +357,40 @@ services.xserver.displayManager.defaultSession = "xfce+icewm";
<link linkend="opt-services.httpd.virtualHosts">services.httpd.virtualHosts.&lt;name&gt;.useACMEHost</link>.
</para>
</listitem>
<listitem>
<para>
For NixOS configuration options, the <literal>loaOf</literal> type has
been deprecated and will be removed in a future release. In nixpkgs,
options of this type will be changed to <literal>attrsOf</literal>
instead. If you were using one of these in your configuration, you will
see a warning suggesting what changes will be required.
</para>
<para>
For example, <link linkend="opt-users.users">users.users</link> is a
<literal>loaOf</literal> option that is commonly used as follows:
<programlisting>
users.users =
[ { name = "me";
description = "My personal user.";
isNormalUser = true;
}
];
</programlisting>
This should be rewritten by removing the list and using the
value of <literal>name</literal> as the name of the attribute set:
<programlisting>
users.users.me =
{ description = "My personal user.";
isNormalUser = true;
};
</programlisting>
</para>
<para>
For more information on this change have look at these links:
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/1800">issue #1800</link>,
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/63103">PR #63103</link>.
</para>
</listitem>
</itemizedlist>
</section>

1 change: 1 addition & 0 deletions nixos/tests/common/user-account.nix
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
{ isNormalUser = true;
description = "Alice Foobar";
password = "foobar";
uid = 1000;
};

users.users.bob =
78 changes: 58 additions & 20 deletions nixos/tests/gnome3-xorg.nix
Original file line number Diff line number Diff line change
@@ -1,41 +1,79 @@
import ./make-test.nix ({ pkgs, ...} : {
import ./make-test-python.nix ({ pkgs, ...} : {
name = "gnome3-xorg";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = pkgs.gnome3.maintainers;
};

machine =
{ ... }:
machine = { nodes, ... }: let
user = nodes.machine.config.users.users.alice;
in

{ imports = [ ./common/user-account.nix ];

services.xserver.enable = true;

services.xserver.displayManager.gdm.enable = false;
services.xserver.displayManager.lightdm.enable = true;
services.xserver.displayManager.lightdm.autoLogin.enable = true;
services.xserver.displayManager.lightdm.autoLogin.user = "alice";
services.xserver.displayManager.gdm = {
enable = true;
autoLogin = {
enable = true;
user = user.name;
};
};

services.xserver.desktopManager.gnome3.enable = true;
services.xserver.displayManager.defaultSession = "gnome-xorg";

virtualisation.memorySize = 1024;
};

testScript =
''
$machine->waitForX;
testScript = { nodes, ... }: let
user = nodes.machine.config.users.users.alice;
uid = toString user.uid;
bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus";
xauthority = "/run/user/${uid}/gdm/Xauthority";
display = "DISPLAY=:0.0";
env = "${bus} XAUTHORITY=${xauthority} ${display}";
gdbus = "${env} gdbus";
su = command: "su - ${user.name} -c '${env} ${command}'";

# Call javascript in gnome shell, returns a tuple (success, output), where
# `success` is true if the dbus call was successful and output is what the
# javascript evaluates to.
eval = "call --session -d org.gnome.Shell -o /org/gnome/Shell -m org.gnome.Shell.Eval";

# False when startup is done
startingUp = su "${gdbus} ${eval} Main.layoutManager._startingUp";

# Start gnome-terminal
gnomeTerminalCommand = su "gnome-terminal";

# wait for alice to be logged in
$machine->waitForUnit("default.target","alice");
# Hopefully gnome-terminal's wm class
wmClass = su "${gdbus} ${eval} global.display.focus_window.wm_class";
in ''
with subtest("Login to GNOME Xorg with GDM"):
machine.wait_for_x()
# Wait for alice to be logged in"
machine.wait_for_unit("default.target", "${user.name}")
machine.wait_for_file("${xauthority}")
machine.succeed("xauth merge ${xauthority}")
# Check that logging in has given the user ownership of devices
assert "alice" in machine.succeed("getfacl -p /dev/snd/timer")
# Check that logging in has given the user ownership of devices.
$machine->succeed("getfacl -p /dev/snd/timer | grep -q alice");
with subtest("Wait for GNOME Shell"):
# correct output should be (true, 'false')
machine.wait_until_succeeds(
"${startingUp} | grep -q 'true,..false'"
)
$machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
$machine->succeed("xauth merge ~alice/.Xauthority");
$machine->waitForWindow(qr/alice.*machine/);
$machine->succeed("timeout 900 bash -c 'while read msg; do if [[ \$msg =~ \"GNOME Shell started\" ]]; then break; fi; done < <(journalctl -f)'");
$machine->sleep(10);
$machine->screenshot("screen");
with subtest("Open Gnome Terminal"):
machine.succeed(
"${gnomeTerminalCommand}"
)
# correct output should be (true, '"Gnome-terminal"')
machine.wait_until_succeeds(
"${wmClass} | grep -q 'true,...Gnome-terminal'"
)
machine.sleep(20)
machine.screenshot("screen")
'';
})
4 changes: 2 additions & 2 deletions pkgs/applications/audio/elisa/default.nix
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@

mkDerivation rec {
pname = "elisa";
version = "0.4.2";
version = "19.12.0";

src = fetchFromGitHub {
owner = "KDE";
repo = "elisa";
rev = "v${version}";
sha256 = "0q098zaajwbpkrarrsdzpjhpsq2nxkqaxwzhr2gjlg08j9vqkpfm";
sha256 = "1939xwhy1s502pai63vz56hnnsl3qsb6arhrlg5bw6bwsv88blac";
};

buildInputs = [ vlc ];
4 changes: 2 additions & 2 deletions pkgs/applications/audio/pulseeffects/default.nix
Original file line number Diff line number Diff line change
@@ -46,13 +46,13 @@ let
];
in stdenv.mkDerivation rec {
pname = "pulseeffects";
version = "4.6.9";
version = "4.7.0";

src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
sha256 = "0ag19hvf50ip7z1s8jziy4pm8c72w7qq9zzgb4967l6v17rar4yh";
sha256 = "1cpiill24c54sy97xm1r0sqqpxj6ar40pnnwb72qs8b9zzci920r";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/applications/audio/qjackctl/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, mkDerivation, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:

mkDerivation rec {
version = "0.6.0";
version = "0.6.1";
pname = "qjackctl";

# some dependencies such as killall have to be installed additionally

src = fetchurl {
url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz";
sha256 = "1kddvxxhwvw1ps1c1drr08hxqci7jw4jwr8h1d9isb8agydfxmcx";
sha256 = "09y0s43ypcghnvzsz89mi1qs5bsvn4hpb98lqxmwwsy0ikcv3hny";
};

buildInputs = [
4 changes: 2 additions & 2 deletions pkgs/applications/blockchains/ledger-live-desktop/default.nix
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

let
pname = "ledger-live-desktop";
version = "1.19.2";
version = "1.20.0";
name = "${pname}-${version}";

src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
sha256 = "1qgk0gwn7ijz00zfwf9rfl755lhgsig9xa6c3icj6l6wyzybz0z6";
sha256 = "09mgd5nsd65w4irgzgmfz1k0r1k4fgkq490pkil8nqy6akjrsw1z";
};

appimageContents = appimageTools.extractType2 {
Loading