diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-23 09:40:37 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-23 09:40:37 -0400 |
commit | 18742471aff29270453a540f84d543137ee9d44e (patch) | |
tree | d21863fd81db3722e8cac52b52be3dd1c429cf21 /pkgs/tools | |
parent | 2e831da76da0a51557975a55dc8a18ebf3401bfb (diff) | |
parent | bbcaf78350d87c4657b1a2451132535467a454eb (diff) | |
download | nixlib-18742471aff29270453a540f84d543137ee9d44e.tar nixlib-18742471aff29270453a540f84d543137ee9d44e.tar.gz nixlib-18742471aff29270453a540f84d543137ee9d44e.tar.bz2 nixlib-18742471aff29270453a540f84d543137ee9d44e.tar.lz nixlib-18742471aff29270453a540f84d543137ee9d44e.tar.xz nixlib-18742471aff29270453a540f84d543137ee9d44e.tar.zst nixlib-18742471aff29270453a540f84d543137ee9d44e.zip |
Merge remote-tracking branch 'upstream/master' into staging
Use newer vagrant from master
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/graphics/s2png/default.nix | 24 | ||||
-rw-r--r-- | pkgs/tools/misc/calamares/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/debootstrap/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/gams/default.nix | 50 | ||||
-rw-r--r-- | pkgs/tools/misc/thefuck/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/tmux/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/package-management/cargo-tree/default.nix | 24 | ||||
-rw-r--r-- | pkgs/tools/package-management/nixops/unstable.nix | 6 |
8 files changed, 109 insertions, 11 deletions
diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/tools/graphics/s2png/default.nix new file mode 100644 index 000000000000..fd538eec573d --- /dev/null +++ b/pkgs/tools/graphics/s2png/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, diffutils, gd, pkgconfig }: + +stdenv.mkDerivation rec { + name = "s2png-${version}"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "dbohdan"; + repo = "s2png"; + rev = "v${version}"; + sha256 = "0y3crfm0jqprgxamlly713cka2x1bp6z63p1lw9wh4wc37kpira6"; + }; + + buildInputs = [ diffutils gd pkgconfig ]; + installFlags = [ "prefix=" "DESTDIR=$(out)" ]; + + meta = { + homepage = https://github.com/dbohdan/s2png/; + description = "Store any data in PNG images"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.dbohdan ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index f66cc60c9267..5dba7744d7b3 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "calamares"; - version = "3.1.12"; + version = "3.2.0"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0k59wnch2gmbsr5dh5swbjp4rkf5c1ml0n4sxf196wdasraismc6"; + sha256 = "1i5q3hffjqi1id9kv8sixhddxd90d5qqmbc7gf5vf9m3c54pln64"; }; buildInputs = [ diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 22bf8340156c..d12038a707d2 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.99"; + version = "1.0.100"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "1plw53zghiykddj77s5jk10ncx82cgrkk798p909yydhcghnvcsb"; + sha256 = "0jmwf26sq4bkdz6wi0dcjsrfkg8c8k3xdhi11xp6cdrw6qpw82ws"; }; buildInputs = [ dpkg gettext gawk perl ]; diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix new file mode 100644 index 000000000000..613fdc0f4555 --- /dev/null +++ b/pkgs/tools/misc/gams/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, unzip, lib, file, licenseFile, optgamsFile}: + +assert licenseFile != null; + +stdenv.mkDerivation rec { + version = "25.0.2"; + name = "gams-${version}"; + src = fetchurl { + url = "https://d37drm4t2jghv5.cloudfront.net/distributions/${version}/linux/linux_x64_64_sfx.exe"; + sha256 = "4f95389579f33ff7c2586838a2c19021aa0746279555cbb51aa6e0efd09bd297"; + }; + unpackCmd = "unzip $src"; + buildInputs = [ unzip file ]; + dontBuild = true; + + installPhase = '' + mkdir -p "$out/bin" "$out/share/gams" + cp -a * "$out/share/gams" + + cp ${licenseFile} $out/share/gamslice.txt + '' + stdenv.lib.optionalString (optgamsFile != null) '' + cp ${optgamsFile} $out/share/optgams.def + ln -s $out/share/gams/optgams.def $out/bin/optgams.def + ''; + + postFixup = '' + for f in $out/share/gams/*; do + if [[ -x $f ]] && [[ -f $f ]] && [[ ! $f =~ .*\.so$ ]]; then + if patchelf \ + --set-rpath "$out/share/gams" \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $f; then + ln -s $f $out/bin/$(basename $f) + fi + fi + done + ''; + + meta = with stdenv.lib;{ + description = "General Algebraic Modeling System"; + longDescription = '' + The General Algebraic Modeling System is a high-level modeling system for mathematical optimization. + GAMS is designed for modeling and solving linear, nonlinear, and mixed-integer optimization problems. + ''; + homepage = https://www.gams.com/; + license = licenses.unfree; + maintainers = [ maintainers.Scriptkiddi ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index 7befd344a4d8..1ccfc528e8f6 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "thefuck"; - version = "3.26"; + version = "3.27"; src = fetchFromGitHub { owner = "nvbn"; repo = "${pname}"; rev = version; - sha256 = "0iyihbp94z38xajy8yfbn3ky7irnam1zwyswg34cw4kkfgggrwhz"; + sha256 = "1lsg0g9lnpj2nidggm16b7jm4xzhg0dgy81crfzny62hah1zk0pj"; }; propagatedBuildInputs = [ colorama decorator psutil pyte six ]; diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 61370ff890bc..fcec511b7ef5 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { name = "tmux-${version}"; - version = "2.6"; + version = "2.7"; outputs = [ "out" "man" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "0605y0nwfmf0mnq075vk80897c2cvhxxvxinqq7hvrpjf2ph5mww"; + sha256 = "1yr4l8ckd67c3id4vrbpha91xxpdfpw0cpbr3v81lam0m7k4rgba"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix new file mode 100644 index 000000000000..a9c1a1a33b3c --- /dev/null +++ b/pkgs/tools/package-management/cargo-tree/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }: +rustPlatform.buildRustPackage rec { + name = "cargo-tree-${version}"; + version = "0.18.0"; + + src = fetchFromGitHub { + owner = "sfackler"; + repo = "cargo-tree"; + rev = "v${version}"; + + sha256 = "0lq14w11a4zl0rvv7rsd79k51dwk3w78fbsi6klkqknad02qmx3r"; + }; + + cargoSha256 = "0zi4qbadlx4l6zhb0f892ic3mdmyjjjzrirks18pl6qrn3dgny1x"; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + + meta = with lib; { + description = "A cargo subcommand that visualizes a crate's dependency graph in a tree-like format"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ jD91mZM2 ]; + }; +} diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index 8eaf20dc7724..88493d33dd1d 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -5,9 +5,9 @@ # Then copy the URL to the tarball. callPackage ./generic.nix (rec { - version = "1.6pre2276_9203440"; + version = "1.6.1pre2622_f10999a"; src = fetchurl { - url = "https://hydra.nixos.org/build/64518294/download/2/nixops-${version}.tar.bz2"; - sha256 = "1cl0869nl67fr5xk0jl9cvqbmma7d4vz5xbg56jpl7casrr3i51x"; + url = "https://hydra.nixos.org/build/73716350/download/2/nixops-${version}.tar.bz2"; + sha256 = "08886b6vxhjc3cp0ikxp920zap7wp6r92763fp785rvxrmb00rbd"; }; }) |