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: 28eefd1ae287
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ca2247badb13
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 8, 2020

  1. rq: 0.10.4 -> 1.0.2

    @Br1ght0ne
    Br1ght0ne committed Jan 8, 2020
    Copy the full SHA
    9a5b231 View commit details

  2. rq: add filalex77 to maintainers

    @Br1ght0ne
    Br1ght0ne committed Jan 8, 2020
    Copy the full SHA
    03b6800 View commit details

Commits on Jan 11, 2020

  1. Merge pull request #77321 from filalex77/rq-1.0.2 

    rq: 0.10.4 -> 1.0.2
    @marsam
    marsam authored Jan 11, 2020
    Copy the full SHA
    ca2247b View commit details
Showing with 12 additions and 13 deletions.
  1. +9 −12 pkgs/development/tools/rq/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
21 changes: 9 additions & 12 deletions pkgs/development/tools/rq/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
{ stdenv, fetchFromGitHub, rustPlatform, llvmPackages, v8 }:
{ lib, fetchFromGitHub, rustPlatform, libiconv, llvmPackages, v8 }:

with rustPlatform;

buildRustPackage rec {
rustPlatform.buildRustPackage rec {
pname = "rq";
version = "0.10.4";
version = "1.0.2";

src = fetchFromGitHub {
owner = "dflemstr";
repo = "rq";
repo = pname;
rev = "v${version}";
sha256 = "066f6sdy0vrp113wlg18q9p0clyrg9iqbj17ly0yn8dxr5iar002";
sha256 = "0km9d751jr6c5qy4af6ks7nv3xfn13iqi03wq59a1c73rnf0zinp";
};

cargoSha256 = "1n92d82l9wqrpsbkqiir6zsgf12xp4xb6bxq2nywg4lmwrnyapbh";
cargoSha256 = "0z971fpyj4v5hjp6q4yxgxv069h9idkpkcixb14gxi7kpiswprvz";

buildInputs = [ llvmPackages.clang-unwrapped v8 ];

@@ -22,12 +20,11 @@ buildRustPackage rec {
export V8_SOURCE="${v8}"
'';

meta = with stdenv.lib; {
meta = with lib; {
description = "A tool for doing record analysis and transformation";
homepage = https://github.com/dflemstr/rq ;
homepage = "https://github.com/dflemstr/rq";
license = with licenses; [ asl20 ];
maintainers = [ maintainers.aristid ];
maintainers = with maintainers; [ aristid filalex77 ];
platforms = platforms.all;
broken = true;
};
}
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -6114,7 +6114,9 @@ in

routino = callPackage ../tools/misc/routino { };

rq = callPackage ../development/tools/rq { };
rq = callPackage ../development/tools/rq {
inherit (darwin) libiconv;
};

rsnapshot = callPackage ../tools/backup/rsnapshot { };