treewide: remove redundant rec

2019-08-28 11:07:32 +00:00
parent 5061fe0c2c
commit 08f68313a4
1875 changed files with 2591 additions and 2596 deletions
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "agrep";
  version = "3.41.5";

@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, makeWrapper, spidermonkey }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "jsawk";
  version = "1.5-pre";
  src = fetchFromGitHub {
@@ -1,6 +1,6 @@
 { fetchurl }:

-rec {
+{
    version = "0.996";

    src = fetchurl {
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, mecab-nodic }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "mecab-ipadic";
  version = "2.7.0-20070801";

@@ -1,7 +1,7 @@
 { stdenv, bundlerEnv, ruby, bundlerUpdateScript }:

 let
-  papertrail-env = bundlerEnv rec {
+  papertrail-env = bundlerEnv {
    name = "papertrail-env";
    inherit ruby;
    gemfile = ./Gemfile;
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:

-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
  version = "0.3.3";
  sha256 = "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i";
  patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:

-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (args // {
  version = "0.3.4";
  sha256 = "0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg";
 })
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "podiff";
  version = "1.1";

@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python, perl, intltool, flex, autoreconfHook
 , texinfo, libiconv, libintl }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  name = "recode-3.7-2fd838565";

  src = fetchFromGitHub {
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "jing-trang";
  version = "20151127";

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, libxml2 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  name = "xml2-0.5";

  src = fetchurl {
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pythonPackages }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  name= "yaml-merge-2016-02-16";

  src = fetchFromGitHub {
@@ -2,7 +2,7 @@
 , zimlib, cxxtools, tntnet
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  name = "zimreader-0.92";

  src = fetchFromGitHub {