Skip to content

frida-tools: use fetchPypi from top-level#236795

Merged
wegank merged 1 commit intoNixOS:masterfrom
tobim:frida-tools-fix-fetchPypi
Jun 9, 2023
Merged

frida-tools: use fetchPypi from top-level#236795
wegank merged 1 commit intoNixOS:masterfrom
tobim:frida-tools-fix-fetchPypi

Conversation

@tobim
Copy link
Contributor

@tobim tobim commented Jun 9, 2023

Description of changes

According to the release notes fetchPypi should be taken from the top-level now.
Edit: See #234043.

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/)
  • 23.11 Release Notes (or backporting 23.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
  • Fits CONTRIBUTING.md.

@tobim
Copy link
Contributor Author

tobim commented Jun 9, 2023

Before this commit eval is broken:
      error:
       … while querying the derivation named 'frida-tools-12.1.2'

       … while evaluating the attribute 'out.outPath'

         at /home/tobim/.cache/nixpkgs-review/pr-236795-2/nixpkgs/lib/customisation.nix:215:13:

          214|             drvPath = assert condition; drv.${outputName}.drvPath;
          215|             outPath = assert condition; drv.${outputName}.outPath;
             |             ^
          216|           } //

       … while calling the 'getAttr' builtin

         at //builtin/derivation.nix:19:19: (source not available)

       … while calling the 'derivationStrict' builtin

         at //builtin/derivation.nix:9:12: (source not available)

       … while evaluating derivation 'frida-tools-12.1.2'
         whose name attribute is located at /home/tobim/.cache/nixpkgs-review/pr-236795-2/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:303:7

       … while evaluating attribute 'nativeBuildInputs' of derivation 'frida-tools-12.1.2'

         at /home/tobim/.cache/nixpkgs-review/pr-236795-2/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:347:7:

          346|       depsBuildBuild              = lib.elemAt (lib.elemAt dependencies 0) 0;
          347|       nativeBuildInputs           = lib.elemAt (lib.elemAt dependencies 0) 1;
             |       ^
          348|       depsBuildTarget             = lib.elemAt (lib.elemAt dependencies 0) 2;

       … while calling 'chooseDevOutputs'

         at /home/tobim/.cache/nixpkgs-review/pr-236795-2/nixpkgs/lib/attrsets.nix:959:5:

          958|     # List of packages to pick `dev` outputs from
          959|     drvs:
             |     ^
          960|     builtins.map getDev drvs;

       … from call site

         at /home/tobim/.cache/nixpkgs-review/pr-236795-2/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:244:51:

          243|       (map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuild" depsBuildBuild))
          244|       (map (drv: drv.__spliced.buildHost or drv) (checkDependencyList "nativeBuildInputs" nativeBuildInputs'))
             |                                                   ^
          245|       (map (drv: drv.__spliced.buildTarget or drv) (checkDependencyList "depsBuildTarget" depsBuildTarget))

       … while calling 'checkDependencyList''

         at /home/tobim/.cache/nixpkgs-review/pr-236795-2/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:216:43:

          215|   checkDependencyList = checkDependencyList' [];
          216|   checkDependencyList' = positions: name: deps: lib.flip lib.imap1 deps (index: dep:
             |                                           ^
          217|     if lib.isDerivation dep || dep == null || builtins.typeOf dep == "string" || builtins.typeOf dep == "path" then dep

       … from call site

         at /home/tobim/.cache/nixpkgs-review/pr-236795-2/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:216:49:

          215|   checkDependencyList = checkDependencyList' [];
          216|   checkDependencyList' = positions: name: deps: lib.flip lib.imap1 deps (index: dep:
             |                                                 ^
          217|     if lib.isDerivation dep || dep == null || builtins.typeOf dep == "string" || builtins.typeOf dep == "path" then dep

       … while calling 'flip'

         at /home/tobim/.cache/nixpkgs-review/pr-236795-2/nixpkgs/lib/trivial.nix:138:16:

          137|   */
          138|   flip = f: a: b: f b a;
             |                ^
          139|

       … from call site

         at /home/tobim/.cache/nixpkgs-review/pr-236795-2/nixpkgs/lib/trivial.nix:138:19:

          137|   */
          138|   flip = f: a: b: f b a;
             |                   ^
          139|

       … while calling 'imap1'

         at /home/tobim/.cache/nixpkgs-review/pr-236795-2/nixpkgs/lib/lists.nix:117:14:

          116|   */
          117|   imap1 = f: list: genList (n: f (n + 1) (elemAt list n)) (length list);
             |              ^
          118|

       … from call site

         at /home/tobim/.cache/nixpkgs-review/pr-236795-2/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix:181:10:

          180|       pythonRemoveBinBytecodeHook
          181|     ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [
             |          ^
          182|       unzip

       … while calling 'optionals'

         at /home/tobim/.cache/nixpkgs-review/pr-236795-2/nixpkgs/lib/lists.nix:301:5:

          300|     # List to return if condition is true
          301|     elems: if cond then elems else [];
             |     ^
          302|

       … from call site

         at /home/tobim/.cache/nixpkgs-review/pr-236795-2/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix:181:25:

          180|       pythonRemoveBinBytecodeHook
          181|     ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [
             |                         ^
          182|       unzip

       … while calling 'hasSuffix'

         at /home/tobim/.cache/nixpkgs-review/pr-236795-2/nixpkgs/lib/strings.nix:284:5:

          283|     # Input string
          284|     content:
             |     ^
          285|     let

       … from call site

         at /home/tobim/.cache/nixpkgs-review/pr-236795-2/nixpkgs/lib/strings.nix:291:5:

          290|     # to strings and comparing. This was surprising and confusing.
          291|     warnIf
             |     ^
          292|       (isPath suffix)

       … while calling anonymous lambda

         at /home/tobim/.cache/nixpkgs-review/pr-236795-2/nixpkgs/lib/trivial.nix:357:50:

          356|   */
          357|   warnIf = cond: msg: if cond then warn msg else x: x;
             |                                                  ^
          358|

       error: attribute 'fetchPypi' missing

       at /home/tobim/.cache/nixpkgs-review/pr-236795-2/nixpkgs/pkgs/tools/security/frida-tools/default.nix:7:9:

            6|
            7|   src = python3.pkgs.fetchPypi {
             |         ^
            8|     inherit pname version;

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jun 9, 2023
@wegank wegank merged commit d199cc8 into NixOS:master Jun 9, 2023
@panicgh panicgh mentioned this pull request Jun 9, 2023
12 tasks
@tobim tobim deleted the frida-tools-fix-fetchPypi branch June 9, 2023 09:14
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: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants