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

Commits on Dec 5, 2018

  1. rig: init at 1.11

    tomberek committed Dec 5, 2018
    Copy the full SHA
    232f76a View commit details
  2. Merge pull request #51428 from tomberek/rig_init

    rig: init at 1.11
    rasendubi authored Dec 5, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    184aacb View commit details
Showing with 72 additions and 0 deletions.
  1. +31 −0 pkgs/tools/misc/rig/default.nix
  2. +39 −0 pkgs/tools/misc/rig/rig_1.11-1.diff
  3. +2 −0 pkgs/top-level/all-packages.nix
31 changes: 31 additions & 0 deletions pkgs/tools/misc/rig/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{ stdenv, fetchurl } :

stdenv.mkDerivation rec {
version = "1.11";
name = "rig-${version}";

src = fetchurl {
url = "https://ayera.dl.sourceforge.net/project/rig/rig/${version}/rig-${version}.tar.gz";
sha256 = "1f3snysjqqlpk2kgvm5p2icrj4lsdymccmn3igkc2f60smqckgq0";
};

# Note: diff modified from Debian: Norbert Veber <nveber@debian.org>
# http://deb.debian.org/debian/pool/main/r/rig/rig_1.11-1.diff.gz
patches = [ ./rig_1.11-1.diff ];

meta = {
homepage = http://rig.sourceforge.net/;
description = "Random identity generator";
longDescription = ''
RIG (Random Identity Generator) is a free replacement for a shareware
program out there called 'fake'. It generates random, yet real-looking,
personal data. It is useful if you need to feed a name to a Web site,
BBS, or real person, and are too lazy to think of one yourself. Also,
if the Web site/BBS/person you are giving the information to tries to
cross-check the city, state, zip, or area code, it will check out.
'';
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ tomberek ];
platforms = with stdenv.lib.platforms; all;
};
}
39 changes: 39 additions & 0 deletions pkgs/tools/misc/rig/rig_1.11-1.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
--- rig-1.11.orig/Makefile
+++ rig-1.11/Makefile
@@ -1,20 +1,21 @@
-PREFIX=/usr/local
+PREFIX=${out}
BINDIR=${PREFIX}/bin
MANDIR=${PREFIX}/man
DATADIR=${PREFIX}/share/rig
+CXX=g++

all: rig rig.6
rig: rig.cc
- g++ -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\""
+ ${CXX} -O2 -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\""

rig.6: rig.6.in
sed s@DATADIR@"$(DATADIR)"@g < rig.6.in > rig.6

install: rig rig.6
- install -g 0 -m 755 -o 0 -s rig $(BINDIR)
- install -g 0 -m 644 -o 0 rig.6 $(MANDIR)/man6/rig.6
- install -g 0 -m 755 -o 0 -d $(DATADIR)
- install -g 0 -m 644 -o 0 data/*.idx $(DATADIR)
+ install -m 755 -d $(DESTDIR)$(DATADIR)
+ install -m 755 -d $(DESTDIR)$(BINDIR)
+ install -m 755 rig $(DESTDIR)$(BINDIR)/rig
+ install -m 644 data/*.idx $(DESTDIR)$(DATADIR)

clean:
rm -rf *~ *.rej *.orig *.o rig rig.6
--- rig-1.11.orig/rig.cc
+++ rig-1.11/rig.cc
@@ -26,6 +26,7 @@
#include <time.h>
#include <errno.h>
#include <assert.h>
+#include <string.h>

using namespace std;
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -5021,6 +5021,8 @@ in

remarshal = callPackage ../development/tools/remarshal { };

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

rocket = libsForQt5.callPackage ../tools/graphics/rocket { };

rtaudio = callPackage ../development/libraries/audio/rtaudio { };