Commit Graph

59 Commits

Author SHA1 Message Date
Alyssa Ross
a79f4e520e
resholve: oildev: disable libc tests unconditionally
There's no point testing the behaviour of libc on some platforms and
not others if we intend to run on all of them.
2024-02-10 13:16:53 +01:00
Travis A. Everett
f97db00767 oildev: disable libc tests failing w/ musl
This test suite depends on some glibc assumptions.

I'll likely come back and make this unconditional later, but for now
we're trying to minimize rebuilds.

Reported in:
https://github.com/NixOS/nixpkgs/pull/285233#issuecomment-1935890672
2024-02-09 23:39:42 +01:00
Sergei Trofimovich
009b985077 aaxtomp3: fix eval for non-glibc targets
Without the change the eval fails as:

    $ nix build --no-link -f. pkgsCross.aarch64-android.aaxtomp3
    error:
       error: cannot coerce null to a string
2024-01-01 10:17:45 +00:00
Travis A. Everett
7bf3f335a3 resholve: 0.9.0 -> 0.9.1 2023-12-01 05:49:28 +00:00
Randy Eckenrode
1cd0d4b62d
resholve: fix build of oil-pyyajl with clang 16
Fixes several incompatible function pointer conversion errors by
updating the function definitions and casts.
2023-11-08 19:11:45 -05:00
Peder Bergebakken Sundt
470614b671 treewide: Fix typos 2023-09-28 19:06:13 +02:00
Travis A. Everett
6ae601dd25 resholve: fix oildev
This broke after the python2 update in #256132. Also including a dep
removal that I inadvertently left out the last time I updated this.
2023-09-21 22:37:36 -05:00
Travis A. Everett
615f37daf0 resholve: update README
Tracking upstream change in:
abathur/resholve@4f5d9203b5
2023-09-09 11:17:51 +00:00
Travis A. Everett
714cc1046a resholve: fix tests after #232713
One of resholve's passthru tests depended on getting `script` from
util-linux, but it's no longer there on macos after #232713.

This change just tracks upstream change to use unixtools.script, which
is what I should have used in the first place. Upstream commit for
reference:

3407150949
2023-06-04 14:47:31 -05:00
Weijia Wang
d7619eff54 treewide: development: use top-level fetchPypi 2023-05-25 15:52:27 +03:00
Weijia Wang
548235835c
Merge pull request #213450 from abathur/resholve_0.9.0
resholve: 0.8.5 -> 0.9.0
2023-01-30 03:35:53 +01:00
Travis A. Everett
465b512777 resholve: 0.8.5 -> 0.9.0
This release gets resholve caught up to the latest release of oil/osh.
Since the update was already somewhat involved, I used the opportunity
to also figure out how to patch out some C extensions and external
dependencies that shouldn't be necessary just to use the parser.

- update README.md
- github.com/abathur/resholve/blob/master/CHANGELOG.md#v090-jan-29-2023
- github.com/abathur/nix-py-dev-oil/compare/v0.8.12.3...v0.14.0.0
2023-01-29 14:57:10 -06:00
Guillaume Girol
33afbf39f6 treewide: switch to nativeCheckInputs
checkInputs used to be added to nativeBuildInputs. Now we have
nativeCheckInputs to do that instead. Doing this treewide change allows
to keep hashes identical to before the introduction of
nativeCheckInputs.
2023-01-21 12:00:00 +00:00
Travis A. Everett
34f5e5ea79 resholve: 0.8.4 -> 0.8.5; update README 2023-01-17 00:23:23 -06:00
Thiago Kenji Okada
d00a5dad2a
Merge pull request #210761 from abathur/resholve_track_missed_fix
resholve: track missed upstream Nix fix
2023-01-15 18:17:08 +00:00
Thiago Kenji Okada
1d77a86904 resholve: fix CLI tests 2023-01-15 12:29:42 +00:00
Thiago Kenji Okada
03ab899a45 resholve-utils: set disallowedReferences for resholve.mkDerivation 2023-01-15 12:29:42 +00:00
Thiago Kenji Okada
66093a4120 python27: remove stripLibs argument
Since we are now guarantee that the `resholve` is not exposing `python27`,
let's remove the `stripLibs` hack that tried to reduce its size.
2023-01-15 12:29:42 +00:00
Thiago Kenji Okada
c44e0571fc resholve: mark it as knownVulnerabilities, allow resholve-utils usage
We are marking `resholve` itself with `meta.knownVulnerabilities`, and
overriding `resholve-utils` functions's `resholve` with
`meta.knownVulnerabilities = [ ]`.

This way, we can still use `resholve` at build-time without triggering
security warnings, however we can't instantiate `resholve` itself. See:

```
$ nix-build -A resholve
error: Package ‘resholve-0.8.4’ in /.../nixpkgs/pkgs/development/misc/resholve/resholve.nix:48 is marked as insecure, refusing to evaluate.

$ nix-build -A ix
/nix/store/k8cvj1bfxkjj8zdg6kgm7r8942bbj7w7-ix-20190815
```

For debugging purposes, you can still bypass the security checks and
instantiate `resholve` by:

```
$ NIXPKGS_ALLOW_INSECURE=1 nix-build -A resholve
/nix/store/77s87hhqymc6x9wpclb04zg5jwm6fsij-resholve-0.8.4
```
2023-01-15 12:29:42 +00:00
Travis A. Everett
ba5e8f2835 resholve: track missed upstream Nix fix
Forgot to port this resholve Nix API fix in the course of #184292.

Same change as:
github.com/abathur/resholve/commit/b743d2eb12d82e35c567733a7a884174e3606641
2023-01-14 14:38:32 -06:00
Thiago Kenji Okada
e13660c50c resholve: remove openssl from python27 2023-01-10 18:06:09 +00:00
Travis A. Everett
6f1729326a resholve: 0.8.3 -> 0.8.4 2022-12-19 14:17:26 -06:00
figsoda
da56c13198 resholve: fix build on aarch64-darwin 2022-12-18 12:32:53 -05:00
Thiago Kenji Okada
283ecac082 resholve: strip unused libraries from python27
Strip unused libraries from resholve's own python27 derivation, further
reducing its size and reducing its attack surface.
2022-12-15 00:07:02 +00:00
Thiago Kenji Okada
2e943fc060 resholve: use stripped-down python27
This PR strips down the modified `python27` derivation used by `resholve`. The
idea is to reduce the possible security issues, and also to make it easier to
bootstrap.
2022-12-13 14:37:00 +00:00
Travis A. Everett
4fabafb699 resholve: fold in python package deps
Protects resholve and dependents from breakages as py27 support is
removed (or rots).
2022-12-09 17:11:59 -06:00
Thiago Kenji Okada
c6059ff8b6 resholve: use system from stdenv.hostPlatform instead of alias 2022-12-05 14:12:38 +00:00
Thiago Kenji Okada
176ed1927d
Merge pull request #204023 from abathur/resholve_enable_python27
resholve: add usable (overridden) python27
2022-12-03 21:12:09 +00:00
Travis A. Everett
02b7967806 resholve: selectively enable python27 2022-12-03 13:51:48 -06:00
Travis A. Everett
362b223255 resholve: 0.8.1 -> 0.8.3 2022-11-27 23:53:25 -06:00
Weijia Wang
4ef739adf1 scandir: fix build on aarch64-darwin 2022-10-04 13:41:56 +02:00
Travis A. Everett
ff44e1f9dd resholve: use originalSrc for nixpkgs-update bot
Effort to fix automatic nixpkgs-update updates for resholved
packages in 9f6310d did help the bot get further, but it
then failed to find the source outputHash (the outer
derivation's source is the inner derivation; bot looks for
outer.src.outputHash; ours is at outer.src.src.outputHash).

This change uses `originalSrc` to indicate the source of the
inner derivation. Along with ryantm/nixpkgs-update#324, this
enables the bot to fall back on an attr that Nix/nixpkgs are
not directly depending on, supporting automatic updates for
packages built with `resholve.mkDerivation`.
2022-09-17 15:16:05 -05:00
Travis A. Everett
9f6310d611 resholve: fix mangled pname/meta integrations
Two items in resholve's mkDerivation are causing trouble for
some ecosystem tools:

1. I didn't pass through the original package's meta, which breaks the
   ability of at least nixos package search and r-ryantm to find the
   right source file (in the latter case breaking auto updates).

2. I was prepending "resholved-" to the pname, which at least nixos
   package search picks up as the package's name. Repology also tries
   to do this, but their current nix updater will prefer to get this
   data from the name. For now, this means changing to name will not
   stop repology from picking up the `resholved-<package>` names.

   Repology's code makes it clear that they *want* to use the pname/
   version, so I was inclined to settle with what I've got for now,
   but thiagokokada clarified that we aren't just waiting for nixpkgs
   fixes, but because Nix itself isn't exporting the pname/version in
   its JSON. See also:

   - https://github.com/repology/repology-updater/issues/854
   - https://github.com/repology/repology-updater/commit/9313110121df5

   For now, at least, I'll switch to appending "-unresholved" to the
   inner derivation's pname.
2022-09-13 09:20:21 -05:00
Travis A. Everett
700f2bc99f resholve: 0.8.0 -> 0.8.1; update readme 2022-08-02 07:36:20 +02:00
Artturin
b3caa2f1fe treewide: extraPostFetch -> postFetch 2022-05-23 17:18:50 +03:00
Travis A. Everett
09d441d21c resholve: 0.6.9 -> 0.8.0
Also track upstream .nix changes over same window.
2022-04-08 21:13:20 -04:00
Travis A. Everett
234b4a1534
resholve: work around nixpkgs aarch64-darwin issues (#155251)
- add an oil-dev patch to work around build failure documented in
  https://github.com/NixOS/nixpkgs/issues/154203
- override configargparse to disable tests and work around failure
  reported in https://github.com/NixOS/nixpkgs/issues/156807
2022-01-27 10:37:34 +09:00
Travis A. Everett
bd1fbc0a6f resholve: 0.6.8 -> 0.6.9 2022-01-24 08:39:54 +01:00
Travis A. Everett
3b83eeb903 resholve: 0.6.6 -> 0.6.8 2021-11-12 00:24:36 -06:00
Travis A. Everett
a9454f539b resholve: actually import resholveScript* 2021-09-30 18:54:09 -05:00
Travis A. Everett
1dd78cbd74 resholve: 0.6.5 -> 0.6.6, respect buildInputs 2021-09-27 16:01:09 +09:00
Travis A. Everett
407ff07598 resholve: 0.6.4 -> 0.6.5 2021-09-27 16:01:09 +09:00
Travis A. Everett
8b2cd3a79a resholve: 0.6.3 -> 0.6.4 2021-09-27 16:01:09 +09:00
Travis A. Everett
679b29d33d resholve: 0.6.2 -> 0.6.3, fix readme 2021-09-27 16:01:09 +09:00
Travis A. Everett
6568f18ea3 resholve: 0.6.1 -> 0.6.2 2021-09-27 16:01:09 +09:00
Travis A. Everett
b5833091d4 resholve: 0.6.0 -> 0.6.1, add resholveScript* fns 2021-09-27 16:01:09 +09:00
Travis A. Everett
67ec4fa479 resholve: fix review nits from #138080 2021-09-27 16:01:09 +09:00
Travis A. Everett
a649cbca09 resholvePackage: extract util functions
Extract argument-handling utility functions to prepare for adding
resholveScript* functions.

This tracks upstream work, but I broke it up a little more semantically here
in case it aids review. See:
6aab748205
2021-09-27 16:01:09 +09:00
Travis A. Everett
08b791a01b resholve: 0.5.1 -> 0.6.0, refactor, +binlore
A bit going on here.
- Updating resholve from 0.5.1 -> 0.6.0
  - adding a depdendency, `binlore`, to supply ~intel on executables
    that supports new functionality in resholve
  - adding a package, `yallback`, which provides rule-based callbacks
    for YARA rule matches (depdency of `binlore`).
  - automatically generating "lore" for each `input` to a solution in
    `resholvePackage`.
  - update README
- restructuring some nix components to better support
  my local dev and CI workflows.
  - moved package tests into passthru/tests.nix (cuts `bats` out of
    resholve's immediate dependencies, makes it possible to add my
    existing Nix API test).
  - move my oil-dev patches out of resholve into a separate repo (no
    oil rebuild every time resholve's source changes). Also moving
    oil-dev into its own Nix file here, to ~track the default.nix in
    its own repo.
2021-09-22 09:54:04 -05:00
Sandro Jäckel
b4099137b1
pythonPackages: deprecate ConfigArgParse alias 2021-07-21 13:32:54 +02:00