ugrep: init at 2.4.1 by numkem · Pull Request #93296 · NixOS/nixpkgs

numkem · 2020-07-16T19:27:09Z

Motivation for this change

New package per #93125.

Things done

chessai

LGTM

pkgs/tools/text/ugrep/default.nix

hmenke · 2020-07-17T04:27:21Z

Result of nixpkgs-review pr 93296 1

1 package built:

- ugrep

nixos-discourse · 2020-07-17T14:26:25Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/186

davidak

LGTM

works

see comments for possible improvements

davidak · 2020-07-22T01:02:14Z

pkgs/tools/text/ugrep/default.nix

Suggested change

let

pname = "ugrep";

version = "2.4.1";

in stdenv.mkDerivation {

pname = pname;

version = version;

stdenv.mkDerivation rec {

pname = "ugrep";

version = "2.4.1";

you can do this. it's shorter and easier to read i think

I suggested this way following the advice from https://nix.dev/anti-patterns/index.html
However, it can in fact be made a bit nicer by using

Suggested change

let

pname = "ugrep";

version = "2.4.1";

in stdenv.mkDerivation {

pname = pname;

version = version;

let

pname = "ugrep";

version = "2.4.1";

in stdenv.mkDerivation {

inherit pname version;

yes, that looks less redundant

davidak · 2020-07-22T01:05:46Z

pkgs/tools/text/ugrep/default.nix

Suggested change

meta = {

description = "Ultra fast grep with interactive query UI";

homepage = "https://github.com/Genivia/ugrep";

maintainers = with stdenv.lib.maintainers; [ numkem ];

license = stdenv.lib.licenses.bsd3;

platforms = stdenv.lib.platforms.all;

};

meta = with stdenv.lib; {

description = "Ultra fast grep with interactive query UI";

homepage = "https://github.com/Genivia/ugrep";

maintainers = with maintainers; [ numkem ];

license = licenses.bsd3;

platforms = platforms.all;

};

this is also more readable

not tested. please do if accepted

@hmenke would it be ok to use

let inherit (lib) maintainers licenses platforms; in ...

maybe only in the meta section?

like you do in python

from world import tree, river

it looks really bad and is hard to write

stdenv.lib.licenses.bsd3; stdenv.lib.platforms.all;

I don't know, I was just following https://nix.dev/anti-patterns/index.html

numkem · 2020-07-22T01:09:48Z

@davidak I was told to make changes to not use anti-patterns by @hmenke

My original commit was the same as what you are referring to.

davidak · 2020-07-22T01:17:18Z

@numkem oh, ok. i have to read that up. then ignore my comments

thanks for the pr btw

zowoq · 2020-07-24T22:49:56Z

https://nix.dev/anti-patterns/index.html is an "opinionated guide" that lists several patterns which are still allowed in this repo and some are used in almost all derivations.

See https://discourse.nixos.org/t/avoid-rec-expresions-in-nixpkgs/8293/2 for some discussion on this.

zowoq

Feel free to revert the rec and with stdenv.lib; changes, I'm fine with merging them.

zowoq · 2020-07-24T23:41:08Z

pkgs/tools/text/ugrep/default.nix

Suggested change

{ fetchFromGitHub, stdenv, pcre2, boost, zlib, lzham }:

{ stdenv, fetchFromGitHub, boost, bzip2, lz4, pcre2, xz, zlib}:

We can add the other optional deps and I think lzham may be the wrong package?

numkem · 2020-07-25T00:30:55Z

I've reverted the changes and added he missing libraries, it seems to tink all the boxes now.

zowoq · 2020-07-25T00:47:21Z

pkgs/tools/text/ugrep/default.nix

  };

-  buildInputs = [ boost bzip2 lzma lz4 pcre2 zlib ];
+  buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ];


lzma is an alias for xz

zowoq · 2020-07-25T00:48:16Z

@ofborg build ugrep

zowoq · 2020-07-25T01:15:45Z

Builds/runs on nixos and darwin.

Thanks for the PR @numkem! Thanks anyway for the reviews @hmenke @davidak!

## Motivation Dependencies should be up to date. ## Changelog for unstable: Commits: [NixOS/nixpkgs@5717d9d2...28fce082](NixOS/nixpkgs@5717d9d...28fce08) * [`74430a81`](NixOS/nixpkgs@74430a8) flake.nix: use lib.extend * [`bf0d3ff0`](NixOS/nixpkgs@bf0d3ff) bazel-gazelle: 0.20.0 -> 0.21.1 (NixOS/nixpkgs#93611) * [`744b380a`](NixOS/nixpkgs@744b380) poppler: 0.90.0 → 0.90.1: * [`064b1236`](NixOS/nixpkgs@064b123) amdvlk: 2020.Q3.1 -> 2020.Q3.2 * [`6808fbf6`](NixOS/nixpkgs@6808fbf) linux/hardened/patches/4.14: 4.14.188.a -> 4.14.189.a * [`ac0cc4c5`](NixOS/nixpkgs@ac0cc4c) linux/hardened/patches/4.19: 4.19.133.a -> 4.19.134.a * [`534ea8d3`](NixOS/nixpkgs@534ea8d) linux/hardened/patches/5.4: 5.4.52.a -> 5.4.53.a * [`e3973f71`](NixOS/nixpkgs@e3973f7) linux/hardened/patches/5.7: 5.7.9.a -> 5.7.10.a * [`d5e90de8`](NixOS/nixpkgs@d5e90de) oh-my-zsh: 2020-07-18 -> 2020-07-23 * [`24fd45ad`](NixOS/nixpkgs@24fd45a) emacs: Add jansson & harbuzz inputs * [`bf9e3b8d`](NixOS/nixpkgs@bf9e3b8) emacs: Add native-comp feature branch infrastructure * [`2aa39298`](NixOS/nixpkgs@2aa3929) roon-server: rewrite and fix * [`0aadd405`](NixOS/nixpkgs@0aadd40) services.roon-server: fix binary path * [`6d90a8dd`](NixOS/nixpkgs@6d90a8d) gleam: 0.8.0 -> 0.10.1 * [`29c1e061`](NixOS/nixpkgs@29c1e06) ocrmypdf: 10.2.0 -> 10.3.0 * [`2fa4c5aa`](NixOS/nixpkgs@2fa4c5a) plex: 1.19.4.2935 -> 1.19.5.3112 * [`097117cf`](NixOS/nixpkgs@097117c) malcontent: 0.7.0 → 0.8.0 * [`fcb67219`](NixOS/nixpkgs@fcb6721) drone: 1.6.5 → 1.9.0 * [`9d828dbb`](NixOS/nixpkgs@9d828db) syncplay: use python 3.7 * [`494fcb0b`](NixOS/nixpkgs@494fcb0) alttab: 1.4.0 -> 1.5.0 * [`8f5763ae`](NixOS/nixpkgs@8f5763a) podman: 2.0.2 -> 2.0.3 * [`25b0b052`](NixOS/nixpkgs@25b0b05) binaryen: 94 -> 95 * [`02b83615`](NixOS/nixpkgs@02b8361) podman: don't use wrapper on darwin * [`56297502`](NixOS/nixpkgs@5629750) docker-credential-gcr: 2.0.1 -> 2.0.2 * [`b0350bc9`](NixOS/nixpkgs@b0350bc) doctl: 1.45.1 -> 1.46.0 * [`4e76cf3f`](NixOS/nixpkgs@4e76cf3) dunst: 1.4.1 -> 1.5.0 * [`e8908234`](NixOS/nixpkgs@e890823) emacs: Add native builds for nativeComp enabled emacsen * [`807e8e05`](NixOS/nixpkgs@807e8e0) emacs: Always add cairo as a build input if X is enabled * [`84f20643`](NixOS/nixpkgs@84f2064) findomain: 1.7.0 -> 2.1.1 * [`c648cc32`](NixOS/nixpkgs@c648cc3) kafkacat: 1.5.0 -> 1.6.0 * [`71db15ef`](NixOS/nixpkgs@71db15e) kmon: 1.2.0 -> 1.3.0 * [`3b0da63f`](NixOS/nixpkgs@3b0da63) luigi: 3.0.0 -> 3.0.1 * [`d9e6338f`](NixOS/nixpkgs@d9e6338) geogebra: 5-0-574-0 -> 5-0-593-0 * [`b48de3b0`](NixOS/nixpkgs@b48de3b) nix-build-uncached: 0.1.1 -> 1.0.0 * [`36b20732`](NixOS/nixpkgs@36b2073) nomad: 0.11.3 -> 0.12.1 * [`356cb1ea`](NixOS/nixpkgs@356cb1e) ostree: 2020.3 -> 2020.4 * [`fd580997`](NixOS/nixpkgs@fd58099) pdfsam-basic: 4.1.3 -> 4.1.4 * [`8af1c4d0`](NixOS/nixpkgs@8af1c4d) oneDNN: compile without -msse4.1 * [`e8422336`](NixOS/nixpkgs@e842233) kicad-unstable: 2020-05-14 -> 2020-07-21 * [`b6863cbf`](NixOS/nixpkgs@b6863cb) kicad: fix build * [`253f73bd`](NixOS/nixpkgs@253f73b) firefox: fix typo in comment in common.nix * [`069700e4`](NixOS/nixpkgs@069700e) pwndbg: 2019.12.09 -> 2020.07.23 * [`f40699c9`](NixOS/nixpkgs@f40699c) molly-brown: init at 2020-07-06 * [`76d60b0f`](NixOS/nixpkgs@76d60b0) nixos/molly-brown: init * [`2138371c`](NixOS/nixpkgs@2138371) Revert "nomad: 0.11.3 -> 0.12.1" * [`cc665aee`](NixOS/nixpkgs@cc665ae) shadowsocks-rust: 1.8.12 -> 1.8.13 * [`d1b0eef9`](NixOS/nixpkgs@d1b0eef) emacs: Don't use interpolation for version * [`5f74b92a`](NixOS/nixpkgs@5f74b92) emacs: Make stdenv.mkDerivation params non recursive * [`76437a88`](NixOS/nixpkgs@76437a8) writers.writePython2 and writePython3: use "bare" python if no deps are needed * [`aecafd47`](NixOS/nixpkgs@aecafd4) tockloader: 1.4.0 -> 1.5.0 * [`303690cb`](NixOS/nixpkgs@303690c) LTS Haskell 16.6 * [`e5dae612`](NixOS/nixpkgs@e5dae61) hackage-packages.nix: automatic Haskell package set update * [`c6ff9d92`](NixOS/nixpkgs@c6ff9d9) nix-tree: Expose as a top-level attribute, add maintainer * [`ff263519`](NixOS/nixpkgs@ff26351) haskell.packages.ghc865.rebase: jailbreak on ghc 8.6 * [`f19f7e70`](NixOS/nixpkgs@f19f7e7) haskellPackages.xrefcheck: unmark as broken * [`18121c65`](NixOS/nixpkgs@18121c6) haskellPackages.hnix: Fix build * [`5e756f5f`](NixOS/nixpkgs@5e756f5) haskellPackages.haskell-language-server: 0.1.0.0 -> 0.2.0.0 * [`ac8c8239`](NixOS/nixpkgs@ac8c823) ghc.withPackages: Wrap hls with package lookup env * [`91d52901`](NixOS/nixpkgs@91d5290) haskellPackages.scheduler: unmark as broken * [`5dfff453`](NixOS/nixpkgs@5dfff45) haskellPackages.massiv*: disable massiv test, unmark as broken * [`52174923`](NixOS/nixpkgs@5217492) haskellPackages.Color: unmark broken * [`dd6ce8c8`](NixOS/nixpkgs@dd6ce8c) ghc: add new version 8.8.4 * [`8ffedd83`](NixOS/nixpkgs@8ffedd8) haskellPackages: bump default compiler to ghc-8.8.4 * [`f1182ecc`](NixOS/nixpkgs@f1182ec) ghc: drop obsolete 8.4.x version * [`30464da7`](NixOS/nixpkgs@30464da) bluespec: mark package as broken because it depends on dropped ghc-8.4.4 * [`b4dd96b2`](NixOS/nixpkgs@b4dd96b) sad: mark package as broken because if depends on dropped ghc-8.4.4 * [`229a8328`](NixOS/nixpkgs@229a832) hackage2nix.yaml: update list of broken builds to avoid evaluation errors * [`5d021fed`](NixOS/nixpkgs@5d021fe) hackage-packages.nix: automatic Haskell package set update * [`9d17ec40`](NixOS/nixpkgs@9d17ec4) haskellPackages.splot: fix build * [`6d54b2f9`](NixOS/nixpkgs@6d54b2f) ghc 8.8.4, 8.10.1: disable profiled builds on aarch64 to avoid 2GB output limit * [`5e289028`](NixOS/nixpkgs@5e28902) haskell-streaming-commons: update to version 2.2.2.1 to avoid test suite bug * [`692715dc`](NixOS/nixpkgs@692715d) haskellPackages.jsaddle-warp: Fix build * [`0351afda`](NixOS/nixpkgs@0351afd) git-annex: update SHA256 hash for the new 8.20200720.1 version * [`698a614e`](NixOS/nixpkgs@698a614) haskelllPackages.dependent-sum-aeson-orphans: apply patch to fix build * [`11fbe978`](NixOS/nixpkgs@11fbe97) chromium{Beta,Dev}: M84 -> M85 -> M86 (broken) * [`d7e5006b`](NixOS/nixpkgs@d7e5006) licensee: init at 9.14.0 * [`8b95d6de`](NixOS/nixpkgs@8b95d6d) haskellPackages.neuron: Fix build for 0.6.0 and deps * [`6f832d4c`](NixOS/nixpkgs@6f832d4) kepubify: run checks * [`87e51555`](NixOS/nixpkgs@87e5155) shfmt: run checks * [`a104d213`](NixOS/nixpkgs@a104d21) renderdoc: 1.8 -> 1.9 * [`681268d2`](NixOS/nixpkgs@681268d) pythonPackages.trezor: enable shell completion * [`ccb418a3`](NixOS/nixpkgs@ccb418a) haskellPackages.haskell-language-server: 0.2.0.0 -> 0.2.2.0 * [`7b6b361e`](NixOS/nixpkgs@7b6b361) tealdeer: cleanup * [`2bfa6aa8`](NixOS/nixpkgs@2bfa6aa) nixosTests.installed-tests: Add the test data to VM closure * [`8d53e883`](NixOS/nixpkgs@8d53e88) nixosTests.installed-tests.flatpak: Fix * [`61d3f6f7`](NixOS/nixpkgs@61d3f6f) opendmarc: init at 1.3.3 * [`54954055`](NixOS/nixpkgs@5495405) exim: add DMARC support * [`8605e1c4`](NixOS/nixpkgs@8605e1c) bluespec: Fix build without ghc 844 * [`355cb1f4`](NixOS/nixpkgs@355cb1f) clib: 1.11.3 -> 1.11.4 * [`dbd0f3e9`](NixOS/nixpkgs@dbd0f3e) mongodb: 4.0.12 -> 4.2.8 * [`d14d0941`](NixOS/nixpkgs@d14d094) codeql: 2.2.3 -> 2.2.4 * [`3c45c69f`](NixOS/nixpkgs@3c45c69) deno: 1.2.0 -> 1.2.1 * [`94448964`](NixOS/nixpkgs@9444896) notmuch: 0.29.3 -> 0.30 * [`98710d25`](NixOS/nixpkgs@98710d2) flatpak: 1.6.3 → 1.8.1 * [`ec7c9a07`](NixOS/nixpkgs@ec7c9a0) tut: 0.0.13 -> 0.0.14 * [`4c8da32e`](NixOS/nixpkgs@4c8da32) hackage2nix: update list of broken builds * [`dd74d6ba`](NixOS/nixpkgs@dd74d6b) hackage-packages.nix: automatic Haskell package set update * [`1d96606e`](NixOS/nixpkgs@1d96606) haskell-dhall: clean up and drop obsolete overrides * [`b5613e78`](NixOS/nixpkgs@b5613e7) hackage-packages.nix: automatic Haskell package set update * [`379038b4`](NixOS/nixpkgs@379038b) nixosTests.flatpak: clean up * [`f4d4fdcb`](NixOS/nixpkgs@f4d4fdc) haskell-dhall: use latest version for ghc-8.10.x so that we can build with the latest repline library * [`5345c19c`](NixOS/nixpkgs@5345c19) diffoscope: 152 -> 153 * [`3b46d9a6`](NixOS/nixpkgs@3b46d9a) all-cabal-hashes: update to Hackage at 2020-07-24T00:16:27Z * [`e8e0ca28`](NixOS/nixpkgs@e8e0ca2) haskell-shower: jailbreak to fix the build with ghc-8.10.x * [`c8c80478`](NixOS/nixpkgs@c8c8047) sad: comment out the broken build * [`563d5fa7`](NixOS/nixpkgs@563d5fa) fio: 3.20 -> 3.21 * [`140247cd`](NixOS/nixpkgs@140247c) nixos/tests: Add test for syncthing * [`9ab83c6e`](NixOS/nixpkgs@9ab83c6) ugrep: init at 2.4.1 (NixOS/nixpkgs#93296) * [`f4a95e84`](NixOS/nixpkgs@f4a95e8) ocamlPackages.markup: 0.7.5 → 0.8.2 * [`128ca565`](NixOS/nixpkgs@128ca56) drawio: 13.4.5 -> 13.5.1 * [`2532059d`](NixOS/nixpkgs@2532059) drawio: add meta.changelog * [`ecafef0d`](NixOS/nixpkgs@ecafef0) pam_p11: add * [`c177c436`](NixOS/nixpkgs@c177c43) polyml: 5.8 -> 5.8.1 * [`d4b5915d`](NixOS/nixpkgs@d4b5915) mopidy-youtube: 3.0 -> 3.1 * [`7ae31068`](NixOS/nixpkgs@7ae3106) mc: 4.8.24 -> 4.8.25 * [`a6133b7a`](NixOS/nixpkgs@a6133b7) writers.makeScriptWriter: fix on Darwin\MacOS (NixOS/nixpkgs#93757) * [`12186bfb`](NixOS/nixpkgs@12186bf) makemkv: 1.15.1 -> 1.15.2 * [`bc9adde0`](NixOS/nixpkgs@bc9adde) lime: 4.3.1 -> 4.4.0 * [`0cfaf025`](NixOS/nixpkgs@0cfaf02) makemkv: add danieldk as a maintainer * [`45e2ff34`](NixOS/nixpkgs@45e2ff3) tor-browser: disable hardening by default (NixOS/nixpkgs#93154) * [`9f771202`](NixOS/nixpkgs@9f77120) neuron-notes: create a top-level attribute for haskellPackages.neuron * [`352749e5`](NixOS/nixpkgs@352749e) ostree: enable ed25519 support * [`2885306d`](NixOS/nixpkgs@2885306) rls: fix build * [`a8780387`](NixOS/nixpkgs@a878038) nixos/dhcpd: make authoritative mode optional * [`39deb82e`](NixOS/nixpkgs@39deb82) nixos/yggdrasil.nix: test 300::/7 addresses * [`764a9252`](NixOS/nixpkgs@764a925) nixos/yggdrasil: add manual section * [`d800d1e8`](NixOS/nixpkgs@d800d1e) fixup! nixos/yggdrasil: add manual section * [`49dba9c9`](NixOS/nixpkgs@49dba9c) firefox: support for PKCSNixOS/nixpkgs#11 modules in wrapper * [`194d7495`](NixOS/nixpkgs@194d749) eid-mw: update description to mention pkcs11Modules in firefox wrapper * [`56fcf789`](NixOS/nixpkgs@56fcf78) openjdk: build with empty pre-version (NixOS/nixpkgs#92947) * [`d3fdd46b`](NixOS/nixpkgs@d3fdd46) python3Packages.typing-inspect: init at 0.6.0 * [`c45f9a1e`](NixOS/nixpkgs@c45f9a1) qtile: 0.13.0 -> 0.16.0 (NixOS/nixpkgs#93705) * [`669155b0`](NixOS/nixpkgs@669155b) go-task: init at 2.8.1 * [`2a2b31ba`](NixOS/nixpkgs@2a2b31b) nixos/tasks/lvm: fix systemd tmpfiles * [`5475b848`](NixOS/nixpkgs@5475b84) nixos/tests/installer lvm: increase partition size * [`e01583a7`](NixOS/nixpkgs@e01583a) yubikey-agent: fix on darwin * [`4b288de0`](NixOS/nixpkgs@4b288de) newsflash: fix loading external https content * [`3dd951c5`](NixOS/nixpkgs@3dd951c) python3Packages.dataclasses-json: init at 0.5.1 * [`ddcb7637`](NixOS/nixpkgs@ddcb763) sublime-music: init at 0.11.0 * [`1d859196`](NixOS/nixpkgs@1d85919) osu-lazer: 2020.714.0 -> 2020.725.0 (NixOS/nixpkgs#93726) * [`9cf43741`](NixOS/nixpkgs@9cf4374) opendmarc: make perl scripts work * [`cc6c6eac`](NixOS/nixpkgs@cc6c6ea) maintainers: add Chili-Man * [`fd4e3392`](NixOS/nixpkgs@fd4e339) terraform: 0.12.28 -> 0.12.29 * [`ba979da0`](NixOS/nixpkgs@ba979da) lhapdf: 6.2.3 -> 6.3.0 (NixOS/nixpkgs#93796) * [`59484f4d`](NixOS/nixpkgs@59484f4) gobetween: 0.7.0 -> 0.8.0 * [`38898220`](NixOS/nixpkgs@3889822) maintainers: add bouk * [`352eeb05`](NixOS/nixpkgs@352eeb0) mockgen: init at 1.4.3 * [`66f6b42a`](NixOS/nixpkgs@66f6b42) python37Packages.h5netcdf: 0.8.0 -> 0.8.1 * [`999b9db4`](NixOS/nixpkgs@999b9db) python37Packages.ordered-set: 4.0.1 -> 4.0.2 * [`37e277b3`](NixOS/nixpkgs@37e277b) python37Packages.bravia-tv: 1.0.5 -> 1.0.6 * [`f0a98d8e`](NixOS/nixpkgs@f0a98d8) python27Packages.dpkt: 1.9.2 -> 1.9.3 * [`e6877564`](NixOS/nixpkgs@e687756) python37Packages.ase: 3.19.1 -> 3.19.2 * [`81328ea9`](NixOS/nixpkgs@81328ea) miniserve: 0.7.0 -> 0.8.0 * [`b49e7987`](NixOS/nixpkgs@b49e798) pantheon.gala: fix build by using older vala * [`ebfae826`](NixOS/nixpkgs@ebfae82) nixos/yubikey-agent: add missing mkIf * [`ec160da4`](NixOS/nixpkgs@ec160da) lf: 14 -> 15 * [`390ce60d`](NixOS/nixpkgs@390ce60) rustracer: 2.1.33 -> 2.1.35 * [`c80bf92d`](NixOS/nixpkgs@c80bf92) gitAndTools.git-workspace: 0.6.0 -> 0.7.0 * [`5ef09f9a`](NixOS/nixpkgs@5ef09f9) evcxr: 0.5.1 -> 0.5.2 * [`479db270`](NixOS/nixpkgs@479db27) epson-escpr2: 1.1.13 -> 1.1.15 * [`8eca34dd`](NixOS/nixpkgs@8eca34d) nixos/tests/networking: fix macvlan tests * [`9bd24ddc`](NixOS/nixpkgs@9bd24dd) tor: build with standard libevent (NixOS/nixpkgs#93854) * [`edb277ac`](NixOS/nixpkgs@edb277a) mu: 1.4.10 -> 1.4.12 * [`43eaad56`](NixOS/nixpkgs@43eaad5) ocamlPackages.ocsigen_server: fix compilation * [`6a565f29`](NixOS/nixpkgs@6a565f2) ocamlPackages.ocsigen_server: 2.15.0 → 2.16.0 * [`2bd78b20`](NixOS/nixpkgs@2bd78b2) tdesktop: 2.1.13 -> 2.2.0 (NixOS/nixpkgs#93901) * [`28fce082`](NixOS/nixpkgs@28fce08) pantheon: more build fixes by using older vala

## Changelog for nixpkgs: Commits: [NixOS/nixpkgs@5717d9d2...28fce082](NixOS/nixpkgs@5717d9d...28fce08) * [`74430a81`](NixOS/nixpkgs@74430a8) flake.nix: use lib.extend * [`bf0d3ff0`](NixOS/nixpkgs@bf0d3ff) bazel-gazelle: 0.20.0 -> 0.21.1 (NixOS/nixpkgs#93611) * [`744b380a`](NixOS/nixpkgs@744b380) poppler: 0.90.0 → 0.90.1: * [`064b1236`](NixOS/nixpkgs@064b123) amdvlk: 2020.Q3.1 -> 2020.Q3.2 * [`6808fbf6`](NixOS/nixpkgs@6808fbf) linux/hardened/patches/4.14: 4.14.188.a -> 4.14.189.a * [`ac0cc4c5`](NixOS/nixpkgs@ac0cc4c) linux/hardened/patches/4.19: 4.19.133.a -> 4.19.134.a * [`534ea8d3`](NixOS/nixpkgs@534ea8d) linux/hardened/patches/5.4: 5.4.52.a -> 5.4.53.a * [`e3973f71`](NixOS/nixpkgs@e3973f7) linux/hardened/patches/5.7: 5.7.9.a -> 5.7.10.a * [`d5e90de8`](NixOS/nixpkgs@d5e90de) oh-my-zsh: 2020-07-18 -> 2020-07-23 * [`24fd45ad`](NixOS/nixpkgs@24fd45a) emacs: Add jansson & harbuzz inputs * [`bf9e3b8d`](NixOS/nixpkgs@bf9e3b8) emacs: Add native-comp feature branch infrastructure * [`2aa39298`](NixOS/nixpkgs@2aa3929) roon-server: rewrite and fix * [`0aadd405`](NixOS/nixpkgs@0aadd40) services.roon-server: fix binary path * [`6d90a8dd`](NixOS/nixpkgs@6d90a8d) gleam: 0.8.0 -> 0.10.1 * [`29c1e061`](NixOS/nixpkgs@29c1e06) ocrmypdf: 10.2.0 -> 10.3.0 * [`2fa4c5aa`](NixOS/nixpkgs@2fa4c5a) plex: 1.19.4.2935 -> 1.19.5.3112 * [`097117cf`](NixOS/nixpkgs@097117c) malcontent: 0.7.0 → 0.8.0 * [`fcb67219`](NixOS/nixpkgs@fcb6721) drone: 1.6.5 → 1.9.0 * [`9d828dbb`](NixOS/nixpkgs@9d828db) syncplay: use python 3.7 * [`494fcb0b`](NixOS/nixpkgs@494fcb0) alttab: 1.4.0 -> 1.5.0 * [`8f5763ae`](NixOS/nixpkgs@8f5763a) podman: 2.0.2 -> 2.0.3 * [`25b0b052`](NixOS/nixpkgs@25b0b05) binaryen: 94 -> 95 * [`02b83615`](NixOS/nixpkgs@02b8361) podman: don't use wrapper on darwin * [`56297502`](NixOS/nixpkgs@5629750) docker-credential-gcr: 2.0.1 -> 2.0.2 * [`b0350bc9`](NixOS/nixpkgs@b0350bc) doctl: 1.45.1 -> 1.46.0 * [`4e76cf3f`](NixOS/nixpkgs@4e76cf3) dunst: 1.4.1 -> 1.5.0 * [`e8908234`](NixOS/nixpkgs@e890823) emacs: Add native builds for nativeComp enabled emacsen * [`807e8e05`](NixOS/nixpkgs@807e8e0) emacs: Always add cairo as a build input if X is enabled * [`84f20643`](NixOS/nixpkgs@84f2064) findomain: 1.7.0 -> 2.1.1 * [`c648cc32`](NixOS/nixpkgs@c648cc3) kafkacat: 1.5.0 -> 1.6.0 * [`71db15ef`](NixOS/nixpkgs@71db15e) kmon: 1.2.0 -> 1.3.0 * [`3b0da63f`](NixOS/nixpkgs@3b0da63) luigi: 3.0.0 -> 3.0.1 * [`d9e6338f`](NixOS/nixpkgs@d9e6338) geogebra: 5-0-574-0 -> 5-0-593-0 * [`b48de3b0`](NixOS/nixpkgs@b48de3b) nix-build-uncached: 0.1.1 -> 1.0.0 * [`36b20732`](NixOS/nixpkgs@36b2073) nomad: 0.11.3 -> 0.12.1 * [`356cb1ea`](NixOS/nixpkgs@356cb1e) ostree: 2020.3 -> 2020.4 * [`fd580997`](NixOS/nixpkgs@fd58099) pdfsam-basic: 4.1.3 -> 4.1.4 * [`8af1c4d0`](NixOS/nixpkgs@8af1c4d) oneDNN: compile without -msse4.1 * [`e8422336`](NixOS/nixpkgs@e842233) kicad-unstable: 2020-05-14 -> 2020-07-21 * [`b6863cbf`](NixOS/nixpkgs@b6863cb) kicad: fix build * [`253f73bd`](NixOS/nixpkgs@253f73b) firefox: fix typo in comment in common.nix * [`069700e4`](NixOS/nixpkgs@069700e) pwndbg: 2019.12.09 -> 2020.07.23 * [`f40699c9`](NixOS/nixpkgs@f40699c) molly-brown: init at 2020-07-06 * [`76d60b0f`](NixOS/nixpkgs@76d60b0) nixos/molly-brown: init * [`2138371c`](NixOS/nixpkgs@2138371) Revert "nomad: 0.11.3 -> 0.12.1" * [`cc665aee`](NixOS/nixpkgs@cc665ae) shadowsocks-rust: 1.8.12 -> 1.8.13 * [`d1b0eef9`](NixOS/nixpkgs@d1b0eef) emacs: Don't use interpolation for version * [`5f74b92a`](NixOS/nixpkgs@5f74b92) emacs: Make stdenv.mkDerivation params non recursive * [`76437a88`](NixOS/nixpkgs@76437a8) writers.writePython2 and writePython3: use "bare" python if no deps are needed * [`aecafd47`](NixOS/nixpkgs@aecafd4) tockloader: 1.4.0 -> 1.5.0 * [`303690cb`](NixOS/nixpkgs@303690c) LTS Haskell 16.6 * [`e5dae612`](NixOS/nixpkgs@e5dae61) hackage-packages.nix: automatic Haskell package set update * [`c6ff9d92`](NixOS/nixpkgs@c6ff9d9) nix-tree: Expose as a top-level attribute, add maintainer * [`ff263519`](NixOS/nixpkgs@ff26351) haskell.packages.ghc865.rebase: jailbreak on ghc 8.6 * [`f19f7e70`](NixOS/nixpkgs@f19f7e7) haskellPackages.xrefcheck: unmark as broken * [`18121c65`](NixOS/nixpkgs@18121c6) haskellPackages.hnix: Fix build * [`5e756f5f`](NixOS/nixpkgs@5e756f5) haskellPackages.haskell-language-server: 0.1.0.0 -> 0.2.0.0 * [`ac8c8239`](NixOS/nixpkgs@ac8c823) ghc.withPackages: Wrap hls with package lookup env * [`91d52901`](NixOS/nixpkgs@91d5290) haskellPackages.scheduler: unmark as broken * [`5dfff453`](NixOS/nixpkgs@5dfff45) haskellPackages.massiv*: disable massiv test, unmark as broken * [`52174923`](NixOS/nixpkgs@5217492) haskellPackages.Color: unmark broken * [`dd6ce8c8`](NixOS/nixpkgs@dd6ce8c) ghc: add new version 8.8.4 * [`8ffedd83`](NixOS/nixpkgs@8ffedd8) haskellPackages: bump default compiler to ghc-8.8.4 * [`f1182ecc`](NixOS/nixpkgs@f1182ec) ghc: drop obsolete 8.4.x version * [`30464da7`](NixOS/nixpkgs@30464da) bluespec: mark package as broken because it depends on dropped ghc-8.4.4 * [`b4dd96b2`](NixOS/nixpkgs@b4dd96b) sad: mark package as broken because if depends on dropped ghc-8.4.4 * [`229a8328`](NixOS/nixpkgs@229a832) hackage2nix.yaml: update list of broken builds to avoid evaluation errors * [`5d021fed`](NixOS/nixpkgs@5d021fe) hackage-packages.nix: automatic Haskell package set update * [`9d17ec40`](NixOS/nixpkgs@9d17ec4) haskellPackages.splot: fix build * [`6d54b2f9`](NixOS/nixpkgs@6d54b2f) ghc 8.8.4, 8.10.1: disable profiled builds on aarch64 to avoid 2GB output limit * [`5e289028`](NixOS/nixpkgs@5e28902) haskell-streaming-commons: update to version 2.2.2.1 to avoid test suite bug * [`692715dc`](NixOS/nixpkgs@692715d) haskellPackages.jsaddle-warp: Fix build * [`0351afda`](NixOS/nixpkgs@0351afd) git-annex: update SHA256 hash for the new 8.20200720.1 version * [`698a614e`](NixOS/nixpkgs@698a614) haskelllPackages.dependent-sum-aeson-orphans: apply patch to fix build * [`11fbe978`](NixOS/nixpkgs@11fbe97) chromium{Beta,Dev}: M84 -> M85 -> M86 (broken) * [`d7e5006b`](NixOS/nixpkgs@d7e5006) licensee: init at 9.14.0 * [`8b95d6de`](NixOS/nixpkgs@8b95d6d) haskellPackages.neuron: Fix build for 0.6.0 and deps * [`6f832d4c`](NixOS/nixpkgs@6f832d4) kepubify: run checks * [`87e51555`](NixOS/nixpkgs@87e5155) shfmt: run checks * [`a104d213`](NixOS/nixpkgs@a104d21) renderdoc: 1.8 -> 1.9 * [`681268d2`](NixOS/nixpkgs@681268d) pythonPackages.trezor: enable shell completion * [`ccb418a3`](NixOS/nixpkgs@ccb418a) haskellPackages.haskell-language-server: 0.2.0.0 -> 0.2.2.0 * [`7b6b361e`](NixOS/nixpkgs@7b6b361) tealdeer: cleanup * [`2bfa6aa8`](NixOS/nixpkgs@2bfa6aa) nixosTests.installed-tests: Add the test data to VM closure * [`8d53e883`](NixOS/nixpkgs@8d53e88) nixosTests.installed-tests.flatpak: Fix * [`61d3f6f7`](NixOS/nixpkgs@61d3f6f) opendmarc: init at 1.3.3 * [`54954055`](NixOS/nixpkgs@5495405) exim: add DMARC support * [`8605e1c4`](NixOS/nixpkgs@8605e1c) bluespec: Fix build without ghc 844 * [`355cb1f4`](NixOS/nixpkgs@355cb1f) clib: 1.11.3 -> 1.11.4 * [`dbd0f3e9`](NixOS/nixpkgs@dbd0f3e) mongodb: 4.0.12 -> 4.2.8 * [`d14d0941`](NixOS/nixpkgs@d14d094) codeql: 2.2.3 -> 2.2.4 * [`3c45c69f`](NixOS/nixpkgs@3c45c69) deno: 1.2.0 -> 1.2.1 * [`94448964`](NixOS/nixpkgs@9444896) notmuch: 0.29.3 -> 0.30 * [`98710d25`](NixOS/nixpkgs@98710d2) flatpak: 1.6.3 → 1.8.1 * [`ec7c9a07`](NixOS/nixpkgs@ec7c9a0) tut: 0.0.13 -> 0.0.14 * [`4c8da32e`](NixOS/nixpkgs@4c8da32) hackage2nix: update list of broken builds * [`dd74d6ba`](NixOS/nixpkgs@dd74d6b) hackage-packages.nix: automatic Haskell package set update * [`1d96606e`](NixOS/nixpkgs@1d96606) haskell-dhall: clean up and drop obsolete overrides * [`b5613e78`](NixOS/nixpkgs@b5613e7) hackage-packages.nix: automatic Haskell package set update * [`379038b4`](NixOS/nixpkgs@379038b) nixosTests.flatpak: clean up * [`f4d4fdcb`](NixOS/nixpkgs@f4d4fdc) haskell-dhall: use latest version for ghc-8.10.x so that we can build with the latest repline library * [`5345c19c`](NixOS/nixpkgs@5345c19) diffoscope: 152 -> 153 * [`3b46d9a6`](NixOS/nixpkgs@3b46d9a) all-cabal-hashes: update to Hackage at 2020-07-24T00:16:27Z * [`e8e0ca28`](NixOS/nixpkgs@e8e0ca2) haskell-shower: jailbreak to fix the build with ghc-8.10.x * [`c8c80478`](NixOS/nixpkgs@c8c8047) sad: comment out the broken build * [`563d5fa7`](NixOS/nixpkgs@563d5fa) fio: 3.20 -> 3.21 * [`140247cd`](NixOS/nixpkgs@140247c) nixos/tests: Add test for syncthing * [`9ab83c6e`](NixOS/nixpkgs@9ab83c6) ugrep: init at 2.4.1 (NixOS/nixpkgs#93296) * [`f4a95e84`](NixOS/nixpkgs@f4a95e8) ocamlPackages.markup: 0.7.5 → 0.8.2 * [`128ca565`](NixOS/nixpkgs@128ca56) drawio: 13.4.5 -> 13.5.1 * [`2532059d`](NixOS/nixpkgs@2532059) drawio: add meta.changelog * [`ecafef0d`](NixOS/nixpkgs@ecafef0) pam_p11: add * [`c177c436`](NixOS/nixpkgs@c177c43) polyml: 5.8 -> 5.8.1 * [`d4b5915d`](NixOS/nixpkgs@d4b5915) mopidy-youtube: 3.0 -> 3.1 * [`7ae31068`](NixOS/nixpkgs@7ae3106) mc: 4.8.24 -> 4.8.25 * [`a6133b7a`](NixOS/nixpkgs@a6133b7) writers.makeScriptWriter: fix on Darwin\MacOS (NixOS/nixpkgs#93757) * [`12186bfb`](NixOS/nixpkgs@12186bf) makemkv: 1.15.1 -> 1.15.2 * [`bc9adde0`](NixOS/nixpkgs@bc9adde) lime: 4.3.1 -> 4.4.0 * [`0cfaf025`](NixOS/nixpkgs@0cfaf02) makemkv: add danieldk as a maintainer * [`45e2ff34`](NixOS/nixpkgs@45e2ff3) tor-browser: disable hardening by default (NixOS/nixpkgs#93154) * [`9f771202`](NixOS/nixpkgs@9f77120) neuron-notes: create a top-level attribute for haskellPackages.neuron * [`352749e5`](NixOS/nixpkgs@352749e) ostree: enable ed25519 support * [`2885306d`](NixOS/nixpkgs@2885306) rls: fix build * [`a8780387`](NixOS/nixpkgs@a878038) nixos/dhcpd: make authoritative mode optional * [`39deb82e`](NixOS/nixpkgs@39deb82) nixos/yggdrasil.nix: test 300::/7 addresses * [`764a9252`](NixOS/nixpkgs@764a925) nixos/yggdrasil: add manual section * [`d800d1e8`](NixOS/nixpkgs@d800d1e) fixup! nixos/yggdrasil: add manual section * [`49dba9c9`](NixOS/nixpkgs@49dba9c) firefox: support for PKCSnixos/nixpkgs#11 modules in wrapper * [`194d7495`](NixOS/nixpkgs@194d749) eid-mw: update description to mention pkcs11Modules in firefox wrapper * [`56fcf789`](NixOS/nixpkgs@56fcf78) openjdk: build with empty pre-version (NixOS/nixpkgs#92947) * [`d3fdd46b`](NixOS/nixpkgs@d3fdd46) python3Packages.typing-inspect: init at 0.6.0 * [`c45f9a1e`](NixOS/nixpkgs@c45f9a1) qtile: 0.13.0 -> 0.16.0 (NixOS/nixpkgs#93705) * [`669155b0`](NixOS/nixpkgs@669155b) go-task: init at 2.8.1 * [`2a2b31ba`](NixOS/nixpkgs@2a2b31b) nixos/tasks/lvm: fix systemd tmpfiles * [`5475b848`](NixOS/nixpkgs@5475b84) nixos/tests/installer lvm: increase partition size * [`e01583a7`](NixOS/nixpkgs@e01583a) yubikey-agent: fix on darwin * [`4b288de0`](NixOS/nixpkgs@4b288de) newsflash: fix loading external https content * [`3dd951c5`](NixOS/nixpkgs@3dd951c) python3Packages.dataclasses-json: init at 0.5.1 * [`ddcb7637`](NixOS/nixpkgs@ddcb763) sublime-music: init at 0.11.0 * [`1d859196`](NixOS/nixpkgs@1d85919) osu-lazer: 2020.714.0 -> 2020.725.0 (NixOS/nixpkgs#93726) * [`9cf43741`](NixOS/nixpkgs@9cf4374) opendmarc: make perl scripts work * [`cc6c6eac`](NixOS/nixpkgs@cc6c6ea) maintainers: add Chili-Man * [`fd4e3392`](NixOS/nixpkgs@fd4e339) terraform: 0.12.28 -> 0.12.29 * [`ba979da0`](NixOS/nixpkgs@ba979da) lhapdf: 6.2.3 -> 6.3.0 (NixOS/nixpkgs#93796) * [`59484f4d`](NixOS/nixpkgs@59484f4) gobetween: 0.7.0 -> 0.8.0 * [`38898220`](NixOS/nixpkgs@3889822) maintainers: add bouk * [`352eeb05`](NixOS/nixpkgs@352eeb0) mockgen: init at 1.4.3 * [`66f6b42a`](NixOS/nixpkgs@66f6b42) python37Packages.h5netcdf: 0.8.0 -> 0.8.1 * [`999b9db4`](NixOS/nixpkgs@999b9db) python37Packages.ordered-set: 4.0.1 -> 4.0.2 * [`37e277b3`](NixOS/nixpkgs@37e277b) python37Packages.bravia-tv: 1.0.5 -> 1.0.6 * [`f0a98d8e`](NixOS/nixpkgs@f0a98d8) python27Packages.dpkt: 1.9.2 -> 1.9.3 * [`e6877564`](NixOS/nixpkgs@e687756) python37Packages.ase: 3.19.1 -> 3.19.2 * [`81328ea9`](NixOS/nixpkgs@81328ea) miniserve: 0.7.0 -> 0.8.0 * [`b49e7987`](NixOS/nixpkgs@b49e798) pantheon.gala: fix build by using older vala * [`ebfae826`](NixOS/nixpkgs@ebfae82) nixos/yubikey-agent: add missing mkIf * [`ec160da4`](NixOS/nixpkgs@ec160da) lf: 14 -> 15 * [`390ce60d`](NixOS/nixpkgs@390ce60) rustracer: 2.1.33 -> 2.1.35 * [`c80bf92d`](NixOS/nixpkgs@c80bf92) gitAndTools.git-workspace: 0.6.0 -> 0.7.0 * [`5ef09f9a`](NixOS/nixpkgs@5ef09f9) evcxr: 0.5.1 -> 0.5.2 * [`479db270`](NixOS/nixpkgs@479db27) epson-escpr2: 1.1.13 -> 1.1.15 * [`8eca34dd`](NixOS/nixpkgs@8eca34d) nixos/tests/networking: fix macvlan tests * [`9bd24ddc`](NixOS/nixpkgs@9bd24dd) tor: build with standard libevent (NixOS/nixpkgs#93854) * [`edb277ac`](NixOS/nixpkgs@edb277a) mu: 1.4.10 -> 1.4.12 * [`43eaad56`](NixOS/nixpkgs@43eaad5) ocamlPackages.ocsigen_server: fix compilation * [`6a565f29`](NixOS/nixpkgs@6a565f2) ocamlPackages.ocsigen_server: 2.15.0 → 2.16.0 * [`2bd78b20`](NixOS/nixpkgs@2bd78b2) tdesktop: 2.1.13 -> 2.2.0 (NixOS/nixpkgs#93901) * [`28fce082`](NixOS/nixpkgs@28fce08) pantheon: more build fixes by using older vala

ugrep: init at 2.4.1

79fb392

numkem force-pushed the ugrep branch from b11ccd4 to 79fb392 Compare July 16, 2020 19:31

chessai approved these changes Jul 17, 2020

View reviewed changes

hmenke reviewed Jul 17, 2020

View reviewed changes

pkgs/tools/text/ugrep/default.nix Outdated Show resolved Hide resolved

pkgs/tools/text/ugrep/default.nix Show resolved Hide resolved

pkgs/tools/text/ugrep/default.nix Show resolved Hide resolved

hmenke approved these changes Jul 17, 2020

View reviewed changes

davidak approved these changes Jul 22, 2020

View reviewed changes

zowoq reviewed Jul 24, 2020

View reviewed changes

numkem force-pushed the ugrep branch from 0a87f12 to 79fb392 Compare July 25, 2020 00:18

Add missing optional dependencies

40a4202

ugrep: update deps

1e5f6f2

zowoq reviewed Jul 25, 2020

View reviewed changes

zowoq linked an issue Jul 25, 2020 that may be closed by this pull request

Package ugrep #93125

Closed

zowoq merged commit 9ab83c6 into NixOS:master Jul 25, 2020

numkem deleted the ugrep branch July 25, 2020 13:24

github-actions bot mentioned this pull request Jul 27, 2020

niv unstable: update 5717d9d2 -> 28fce082 pbogdan/tag#23

Merged

github-actions bot mentioned this pull request Jul 27, 2020

niv unstable: update 5717d9d2 -> 28fce082 pbogdan/nix-hie#84

Merged

github-actions bot mentioned this pull request Jul 27, 2020

niv unstable: update 5717d9d2 -> 28fce082 pbogdan/nvs#38

Merged

github-actions bot mentioned this pull request Jul 27, 2020

niv unstable: update 5717d9d2 -> 28fce082 pbogdan/nix-nerd-fonts#25

Merged

github-actions bot mentioned this pull request Jul 29, 2020

niv nixpkgs: update 5717d9d2 -> 28fce082 lovesegfault/nix-config#127

Merged

zowoq mentioned this pull request Jul 30, 2020

qdirstat: 1.6.1 -> 1.7 #94031

Merged

10 tasks

-let
-  pname = "ugrep";
-  version = "2.4.1";
-in stdenv.mkDerivation {
-  pname = pname;
-  version = version;
+stdenv.mkDerivation rec {
+  pname = "ugrep";
+  version = "2.4.1";

-  meta = {
-    description = "Ultra fast grep with interactive query UI";
-    homepage = "https://github.com/Genivia/ugrep";
-    maintainers = with stdenv.lib.maintainers; [ numkem ];
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.all;
-  };
+  meta = with stdenv.lib; {
+    description = "Ultra fast grep with interactive query UI";
+    homepage = "https://github.com/Genivia/ugrep";
+    maintainers = with maintainers; [ numkem ];
+    license = licenses.bsd3;
+    platforms = platforms.all;
+  };

	{ fetchFromGitHub, stdenv, pcre2, boost, zlib, lzham }:
	{ stdenv, fetchFromGitHub, boost, bzip2, lz4, pcre2, xz, zlib}:

Uh oh!

Comments

Conversation

numkem commented Jul 16, 2020

Motivation for this change

Things done

Uh oh!

chessai left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hmenke commented Jul 17, 2020

Uh oh!

nixos-discourse commented Jul 17, 2020

Uh oh!

davidak left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

numkem commented Jul 22, 2020

Uh oh!

davidak commented Jul 22, 2020

Uh oh!

zowoq commented Jul 24, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zowoq left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

numkem commented Jul 25, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zowoq commented Jul 25, 2020

Uh oh!

zowoq commented Jul 25, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

zowoq commented Jul 24, 2020 •

edited

Loading