Skip to content

bibletime: 3.0.2 -> 3.0.3#180606

Merged
AndersonTorres merged 1 commit intoNixOS:masterfrom
AndersonTorres:bibletime
Jul 9, 2022
Merged

bibletime: 3.0.2 -> 3.0.3#180606
AndersonTorres merged 1 commit intoNixOS:masterfrom
AndersonTorres:bibletime

Conversation

@AndersonTorres
Copy link
Member

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@AndersonTorres
Copy link
Member Author

Hello, @roberth !

As a part of my effort of popularizing #119942, I picked this expression. However, when I used it outside stdenv, it barfed like that:

error: value is a function while a set was expected

       … while evaluating anonymous lambda

       at /nix/store/dgr6iwdj4ckw5hmkppnydhplqnr4j1hv-source/pkgs/stdenv/generic/make-derivation.nix:483:3:

          482| in
          483|   fnOrAttrs:
             |   ^
          484|     if builtins.isFunction fnOrAttrs

       … from call site

       at /nix/store/dgr6iwdj4ckw5hmkppnydhplqnr4j1hv-source/pkgs/development/libraries/qt-5/mkDerivation.nix:17:1:

           16|
           17| mkDerivation (args // args_)
             | ^

       … while evaluating anonymous lambda

       at /nix/store/dgr6iwdj4ckw5hmkppnydhplqnr4j1hv-source/pkgs/development/libraries/qt-5/mkDerivation.nix:7:1:

            6|
            7| args:
             | ^
            8|

       … from call site

       at /nix/store/dgr6iwdj4ckw5hmkppnydhplqnr4j1hv-source/pkgs/applications/misc/bibletime/default.nix:20:1:

           19| #stdenv.
           20| mkDerivation (finalAttrs: {
             | ^
           21|   pname = "bibletime";

       … while evaluating anonymous lambda

       at /nix/store/dgr6iwdj4ckw5hmkppnydhplqnr4j1hv-source/pkgs/applications/misc/bibletime/default.nix:1:1:

            1| { lib
             | ^
            2| #, stdenv

       … from call site

       at /nix/store/dgr6iwdj4ckw5hmkppnydhplqnr4j1hv-source/lib/customisation.nix:69:16:

           68|     let
           69|       result = f origArgs;
             |                ^
           70|

       … while evaluating 'makeOverridable'

       at /nix/store/dgr6iwdj4ckw5hmkppnydhplqnr4j1hv-source/lib/customisation.nix:67:24:

           66|   */
           67|   makeOverridable = f: origArgs:
             |                        ^
           68|     let

       … from call site

       at /nix/store/dgr6iwdj4ckw5hmkppnydhplqnr4j1hv-source/lib/customisation.nix:168:34:

          167|
          168|     in if missingArgs == [] then makeOverridable f allArgs else throw error;
             |                                  ^
          169|

       … while evaluating 'callPackageWith'

       at /nix/store/dgr6iwdj4ckw5hmkppnydhplqnr4j1hv-source/lib/customisation.nix:117:35:

          116|   */
          117|   callPackageWith = autoArgs: fn: args:
             |                                   ^
          118|     let

       … from call site

       at /nix/store/dgr6iwdj4ckw5hmkppnydhplqnr4j1hv-source/pkgs/top-level/all-packages.nix:25796:15:

        25795|
        25796|   bibletime = libsForQt5.callPackage ../applications/misc/bibletime { };
             |               ^
        25797|

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jul 8, 2022
@roberth
Copy link
Member

roberth commented Jul 8, 2022

The qt package sets redefine mkDerivation without regard for the possibility of taking a function as an argument.

These mkDerivation functions could be adapted to support it, but all they do is add wrapQtAppsHook, so a simpler solution is to just use the normal mkDerivation and add wrapQtAppsHook yourself. So that's moving away from a form of inheritance (a "hierarchy" of mkDerivation functions) to composition, which is better.

Actually some packages, including this one, already explicitly list wrapQtAppsHook, so they depend on that hook twice (whatever that entails...) and could just switch to stdenv.mkDerivation, thereby removing the duplication.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants