From be1209918bef9aca66e4c87b29f8239e0728f165 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Thu, 28 Sep 2017 09:16:09 +0200 Subject: unicode: init at 2.5 --- pkgs/tools/misc/unicode/default.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/unicode/default.nix (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/tools/misc/unicode/default.nix new file mode 100644 index 000000000000..2b1f5da6e2f9 --- /dev/null +++ b/pkgs/tools/misc/unicode/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, fetchurl, python3Packages }: + +python3Packages.buildPythonApplication rec { + name = "unicode-${version}"; + version = "2.5"; + + src = fetchFromGitHub { + owner = "garabik"; + repo = "unicode"; + rev = "v${version}"; + sha256 = "0vg1zshlzgdva8gzw6fya28fc4jhypjkj743x3q0yabx6934k0g2"; + }; + + ucdtxt = fetchurl { + url = http://www.unicode.org/Public/11.0.0/ucd/UnicodeData-11.0.0d1.txt; + sha256 = "0y9l0sap7yq7c7c8d0fivzycqaw0zncbxzh1inggg42308z974rn"; + }; + + postFixup = '' + substituteInPlace "$out/bin/.unicode-wrapped" \ + --replace "/usr/share/unicode/UnicodeData.txt" "$ucdtxt" + ''; + + meta = with stdenv.lib; { + description = "Display unicode character properties"; + homepage = https://github.com/garabik/unicode; + license = licenses.gpl3; + maintainers = [ maintainers.woffs ]; + }; +} -- cgit 1.4.1 From b46b0468ca71efb3c2b1a32a63274ac041dea3d6 Mon Sep 17 00:00:00 2001 From: amorsillo Date: Thu, 28 Sep 2017 10:42:00 +0000 Subject: mongodb-tools: 3.0.12 -> 3.5.13 (#29884) * Upgrade mongodb-tools to 3.5.13 with ssl * mongodb-tools: fix go references --- pkgs/tools/misc/mongodb-tools/default.nix | 32 +++--- pkgs/tools/misc/mongodb-tools/deps.nix | 155 ++++++++++++++++++++++++++++-- 2 files changed, 166 insertions(+), 21 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index f67fd383f18d..7e24c955a806 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, openssl_1_0_2, pkgconfig, libpcap }: let tools = [ @@ -6,9 +6,12 @@ let "mongooplog" "mongorestore" "mongostat" "mongotop" ]; in + +with stdenv.lib; + buildGoPackage rec { name = "mongo-tools-${version}"; - version = "3.0.12"; + version = "3.5.13"; rev = "r${version}"; goPackagePath = "github.com/mongodb/mongo-tools"; @@ -18,20 +21,27 @@ buildGoPackage rec { inherit rev; owner = "mongodb"; repo = "mongo-tools"; - sha256 = "142vxgniri1mfy2xmfgxhbdp6k6h8c5milv454krv1b51v43hsbm"; + sha256 = "00klm4pyx5k39nn4pmfrpnkqxdhbzm7lprgwxszpirzrarh2g164"; }; goDeps = ./deps.nix; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl_1_0_2 libpcap ]; + # Mongodb incorrectly names all of their binaries main # Let's work around this with our own installer - preInstall = '' - mkdir -p $bin/bin - '' + toString (map (t: '' - go install $goPackagePath/${t}/main - mv go/bin/main $bin/bin/${t} - '' - ) tools) + '' - rm -r go/bin + buildPhase = '' + runHook preBuild + ${stdenv.lib.concatMapStrings (t: '' + go build -o "$bin/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main + '') tools} + runHook postBuild ''; + + meta = { + homepage = https://github.com/mongodb/mongo-tools; + description = "Tools for the MongoDB"; + license = licenses.asl20; + }; } diff --git a/pkgs/tools/misc/mongodb-tools/deps.nix b/pkgs/tools/misc/mongodb-tools/deps.nix index 437dcd649373..30de006db6f7 100644 --- a/pkgs/tools/misc/mongodb-tools/deps.nix +++ b/pkgs/tools/misc/mongodb-tools/deps.nix @@ -1,11 +1,20 @@ [ + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "314a259e304ff91bd6985da2a7149bbf91237993"; + sha256 = "0vya62c3kmhmqx6awlxx8hc84987xkym9rhs0q28vlhwk9kczdaa"; + }; + } { goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + url = "https://github.com/golang/crypto"; + rev = "1f22c0103821b9390939b6776727195525381532"; + sha256 = "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m"; }; } { @@ -13,17 +22,62 @@ fetch = { type = "git"; url = "https://github.com/howeyc/gopass"; - rev = "2c70fa70727c953c51695f800f25d6b44abb368e"; - sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"; + rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; + sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; }; } { goPackagePath = "gopkg.in/mgo.v2"; fetch = { type = "git"; - url = "https://gopkg.in/mgo.v2"; - rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a"; - sha256 = "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj"; + url = "https://github.com/10gen/mgo"; + rev = "39b4000d99037e917f3a3b9d2dcab667a9ef284a"; + sha256 = "1m0xgd3y32g15fhl204g2caarfi5rn41m8pyym0i2gl3jnv5zw99"; + }; + } + { + goPackagePath = "github.com/google/gopacket"; + fetch = { + type = "git"; + url = "https://github.com/google/gopacket"; + rev = "93b782132903d1846aab74cb1f62e6138564949f"; + sha256 = "0l5m5a8dnqbkhphyfq7anj5zv59s74q2l7i6w9r7xwysfiqyq335"; + }; + } + { + goPackagePath = "github.com/patrickmn/go-cache"; + fetch = { + type = "git"; + url = "https://github.com/patrickmn/go-cache"; + rev = "1881a9bccb818787f68c52bfba648c6cf34c34fa"; + sha256 = "1nd0kqijx6mrxb8wlh20bx73mwj0fqzla2sr68y6j6lz3fsy1fw2"; + }; + } + { + goPackagePath = "github.com/spacemonkeygo/openssl"; + fetch = { + type = "git"; + url = "https://github.com/10gen/openssl"; + rev = "2692b9f6fa95e72c75f8d9ba76e49c5dfd2cf8e4"; + sha256 = "16x2mx51977jrqw8d9hqhqmx892v2qf1k5xb01hhfklh58f527k2"; + }; + } + { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "8ddce2a84170772b95dd5d576c48d517b22cac63"; + sha256 = "11rp9wbzkd71640rq0nwmgsddskx3qac8wzqz71ksdb7ixjj5fmj"; + }; + } + { + goPackagePath = "github.com/spacemonkeygo/spacelog"; + fetch = { + type = "git"; + url = "https://github.com/spacemonkeygo/spacelog"; + rev = "f936fb050dc6b5fe4a96b485a6f069e8bdc59aeb"; + sha256 = "00an6zlhjk5l0vk1zjzshhswsd0h4syi48n50hv0fcnbmpxc5hv2"; }; } { @@ -35,13 +89,94 @@ sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"; }; } + { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "8ddce2a84170772b95dd5d576c48d517b22cac63"; + sha256 = "11rp9wbzkd71640rq0nwmgsddskx3qac8wzqz71ksdb7ixjj5fmj"; + }; + } + { + goPackagePath = "github.com/smartystreets/assertions"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/assertions"; + rev = "287b4346dc4e71a038c346375a9d572453bc469b"; + sha256 = "1nw9j9aircra68lbkp5bq4l8ayq4g3fvbb2x8qd2hg0vwgn5yaij"; + }; + } + { + goPackagePath = "github.com/smartystreets/goconvey"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/goconvey"; + rev = "bf58a9a1291224109919756b4dcc469c670cc7e4"; + sha256 = "1k8k6vvlpl5a19dbrywxjmcia36macjbajx2hb6ci64rdfyf5kz5"; + }; + } + { + goPackagePath = "github.com/jacobsa/oglematchers"; + fetch = { + type = "git"; + url = "https://github.com/jacobsa/oglematchers"; + rev = "3ecefc49db07722beca986d9bb71ddd026b133f0"; + sha256 = "0vrk5sfs1ymkg0gv5n5dn9x0kqiaw8gaapljj8q75mgrr1p5149y"; + }; + } + { + goPackagePath = "github.com/3rf/mongo-lint"; + fetch = { + type = "git"; + url = "https://github.com/3rf/mongo-lint"; + rev = "3550fdcf1f43b89aaeabaa4559eaae6dc4407e42"; + sha256 = "19b60a3i6kzssd15dg57y4bg49sw41idrsjdi8vr4j5lr5d7gviv"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } + { + goPackagePath = "github.com/10gen/escaper"; + fetch = { + type = "git"; + url = "https://github.com/10gen/escaper"; + rev = "17fe61c658dcbdcbf246c783f4f7dc97efde3a8b"; + sha256 = "1iw86lg8ad5gdm46ryf4v431ix834l52lrjvcahq3c4dw1ylnbvl"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380"; + sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "0723e7c3d0a317dea811f0fbe4d6edd81908c971"; + sha256 = "1ak35nhlgjpbpnh7v9qvjyfsq52liz3niqfqva76p7a68pblwbr7"; + }; + } { goPackagePath = "github.com/jessevdk/go-flags"; fetch = { type = "git"; url = "https://github.com/jessevdk/go-flags"; - rev = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539"; - sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"; + rev = "97448c91aac742cbca3d020b3e769013a420a06f"; + sha256 = "0fv3yxvq8m3639a279hq4pf0c52ngqfl5n1vklcfympndrb7zjzj"; }; } ] -- cgit 1.4.1 From f79fde1ca4da148fd7a440d376e85b6670d4560d Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Sun, 24 Sep 2017 21:04:04 +0200 Subject: routino: init at 3.2 --- pkgs/tools/misc/routino/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/misc/routino/default.nix (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix new file mode 100644 index 000000000000..2629b8fd5d89 --- /dev/null +++ b/pkgs/tools/misc/routino/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, perl, zlib, bzip2 }: + +stdenv.mkDerivation rec { + name = "Routino-${version}"; + version = "3.2"; + + src = fetchurl { + url = "http://routino.org/download/routino-${version}.tgz"; + sha256 = "0lkmpi8gn7qf40cx93jcp7nxa9dfwi1d6rjrhcqbdymszzm33972"; + }; + + nativeBuildInputs = [ perl ]; + buildInputs = [ zlib bzip2 ]; + + installFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + homepage = http://www.routino.org/; + description = "OpenStreetMap Routing Software"; + license = licenses.agpl3; + maintainter = with maintainers; [ dotlambda ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4324cc0092f2..104551754128 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4179,6 +4179,8 @@ with pkgs; rnv = callPackage ../tools/text/xml/rnv { }; + routino = callPackage ../tools/misc/routino { }; + rq = callPackage ../development/tools/rq { v8 = v8_static; }; -- cgit 1.4.1 From 0395a0d10bd1a47db0592047a668b9334af60a4f Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 28 Sep 2017 17:29:49 +0000 Subject: routino: fix data path --- pkgs/tools/misc/routino/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index 2629b8fd5d89..e3e174e0204a 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -1,18 +1,21 @@ { stdenv, fetchurl, perl, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "Routino-${version}"; + name = "routino-${version}"; version = "3.2"; src = fetchurl { - url = "http://routino.org/download/routino-${version}.tgz"; + url = "http://routino.org/download/${name}.tgz"; sha256 = "0lkmpi8gn7qf40cx93jcp7nxa9dfwi1d6rjrhcqbdymszzm33972"; }; nativeBuildInputs = [ perl ]; + buildInputs = [ zlib bzip2 ]; - installFlags = [ "prefix=$(out)" ]; + outputs = [ "out" "doc" ]; + + makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { homepage = http://www.routino.org/; -- cgit 1.4.1 From 8ebe47a45a04d20374ebec1b120715ab9d49dd45 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Fri, 29 Sep 2017 07:00:37 -0300 Subject: gparted: 0.28.1 -> 0.29.0 --- pkgs/tools/misc/gparted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 67e5a7848b2e..76bfb8c661ed 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -4,10 +4,10 @@ }: stdenv.mkDerivation rec { - name = "gparted-0.28.1"; + name = "gparted-0.29.0"; src = fetchurl { - sha256 = "0cyk8lpimm6wani8khw0szwqkgw5wpq2mfnfxkbgfm2774a1z2bn"; + sha256 = "1kf3ly7m3bikyzapjw8q1rlia0kg5zzgp59akhabx1rnnimvyl12"; url = "mirror://sourceforge/gparted/${name}.tar.gz"; }; -- cgit 1.4.1 From dba8058f9d40c7821082cded76cb113dd57eee24 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 29 Sep 2017 21:16:42 +0200 Subject: system-config-printer: add (optional) dependency pysmbc Use case: https://askubuntu.com/questions/548361/browse-button-disabled-in-windows-printer-via-samba-for-printer-shares --- pkgs/tools/misc/system-config-printer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index fbef31fb5467..72d45c90f106 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook ]; pythonPath = with pythonPackages; - [ pycups pycurl dbus-python pygobject3 requests pycairo pythonPackages.pycurl ]; + [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; configureFlags = [ "--with-udev-rules" -- cgit 1.4.1 From 8836c4d71b13a3052fc5f360a987dea859c9bf5e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 30 Sep 2017 21:27:32 +0300 Subject: hdf5-fortran: Mark broken on Darwin Never succeeded. https://hydra.nixos.org/build/62044922 --- pkgs/tools/misc/hdf5/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 257ade407279..1b979bae0900 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -66,5 +66,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.free; # BSD-like homepage = https://www.hdfgroup.org/HDF5/; platforms = stdenv.lib.platforms.unix; + broken = (gfortran != null) && stdenv.isDarwin; }; } -- cgit 1.4.1 From 4126100103c5e9419378a010b5bb9ed8e6f6917c Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 30 Sep 2017 23:20:52 -0300 Subject: entr: 3.8 -> 3.9 --- pkgs/tools/misc/entr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index 582e01c6f2fe..d37655134c55 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "entr-${version}"; - version = "3.8"; + version = "3.9"; src = fetchurl { url = "http://entrproject.org/code/${name}.tar.gz"; - sha256 = "1g969gw92q8pd3zfbx37w14l92xd3nzi24083x47dns8v69ygcgb"; + sha256 = "0xk8y8asy0wxi5jx03c521p9919gjr8053lxpfzn83jkmqc8zmq2"; }; postPatch = '' -- cgit 1.4.1 From 2cc22aca753e8959765addedc4dc44955a8304a6 Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Tue, 5 Sep 2017 14:12:27 +0300 Subject: xflux-gui: 2016-09-21 -> 1.1.10 --- pkgs/tools/misc/xflux/gui.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 1fd3b3d8371f..d8959687945a 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -4,13 +4,13 @@ }: pythonPackages.buildPythonApplication rec { name = "xflux-gui-${version}"; - version = "2016-09-21"; + version = "1.1.10"; src = fetchFromGitHub { repo = "xflux-gui"; owner = "xflux-gui"; - rev = "0b56204477494b473a390e8b0db043437ec14f32"; - sha256 = "15pr8f31jnhqjlpvasnj6cmm6hw5gljphh2pxzav3zd9bp4yl56r"; + rev = "v${version}"; + sha256 = "1k67qg9y4c0n9ih0syx81ixbdl2x89gd4arwh71316cshskn0rc8"; }; propagatedBuildInputs = with pythonPackages; [ @@ -32,7 +32,6 @@ pythonPackages.buildPythonApplication rec { postFixup = '' wrapGAppsHook - makeWrapperArgs="''${gappsWrapperArgs[@]}" wrapPythonPrograms patchPythonScript $out/${pythonPackages.python.sitePackages}/fluxgui/fluxapp.py ''; -- cgit 1.4.1