diff options
Diffstat (limited to 'pkgs/applications')
10 files changed, 70 insertions, 28 deletions
diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index afc5b40f9db5..aee73cecdfc7 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.21.3"; + version = "0.21.5"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1pzdgghbsss2qjfgl42lvkbs5yc5q6jnzqnp24lljmrh341g2zn4"; + sha256 = "1jx33n8dhn16iaxvmc56cxw0i5qk0ga5nf7qf9frwwq6zkglknga"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index aa1ac0f26208..8281596374cc 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "12.9.9"; + version = "13.0.3"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "07lx99fd4vkgdhagshzawrh8ncbv19hvxjpzgd3yjdj0nalvmxin"; + sha256 = "104pfwipm8ch9xqlsz1gh18icr1p6i3n4c77bbdjakxcy4s5n7sg"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index c4639150dd4b..82730842baca 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3, installShellFiles }: stdenv.mkDerivation rec { - version = "1.8"; + version = "1.8.1"; pname = "ddgr"; src = fetchFromGitHub { owner = "jarun"; repo = "ddgr"; rev = "v${version}"; - sha256 = "1cyaindcg2vc3ij0p6b35inr01c6ys04izxsn1h70ixhsz46qg8z"; + sha256 = "0668wzh1gqin0xscy3fly9hz370n2ny175f3kya9bsld0x0jkd5p"; }; nativeBuildInputs = [ installShellFiles ]; @@ -17,11 +17,6 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - # Version 1.8 was released as 1.7 - postPatch = '' - substituteInPlace ddgr --replace "_VERSION_ = '1.7'" "_VERSION_ = '${version}'" - ''; - postInstall = '' installShellCompletion --bash --name ddgr.bash auto-completion/bash/ddgr-completion.bash installShellCompletion --fish auto-completion/fish/ddgr.fish diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 6ac2e89cf40e..7319dd4a44fa 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib }: +{ stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib, AppKit }: stdenv.mkDerivation rec { pname = "pjsip"; @@ -11,12 +11,19 @@ stdenv.mkDerivation rec { sha256 = "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0"; }; - patches = [ ./fix-aarch64.patch ]; + patches = [ + ./fix-aarch64.patch + ]; - buildInputs = [ openssl libsamplerate alsaLib ]; + buildInputs = [ openssl libsamplerate ] + ++ stdenv.lib.optional stdenv.isLinux alsaLib + ++ stdenv.lib.optional stdenv.isDarwin AppKit; preConfigure = '' export LD=$CC + '' # Fixed on master, remove with 2.11 + + stdenv.lib.optionalString stdenv.isDarwin '' + NIX_CFLAGS_COMPILE+=" -framework Security" ''; postInstall = '' @@ -29,11 +36,11 @@ stdenv.mkDerivation rec { # We need the libgcc_s.so.1 loadable (for pthread_cancel to work) dontPatchELF = true; - meta = { + meta = with stdenv.lib; { description = "A multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE"; homepage = "https://pjsip.org/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [olynch]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ olynch ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index 8ea3588fa8ca..59b173ac98cd 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "1.0.20190902"; + version = "1.0.20200331"; pname = "dcm2niix"; src = fetchFromGitHub { owner = "rordenlab"; repo = "dcm2niix"; rev = "v${version}"; - sha256 = "0h8jsadgv831lqb0jhnaxm7lldirmnp5agrhgg5bcxvn860fl15b"; + sha256 = "1cncfwhyhmg18n970lkn6yvp0i74ajznsl8dqz00asqfzmg681n1"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 87d46850f140..b006a9dd18d1 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -8,11 +8,11 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { pname = "mxnet"; - version = "1.4.1"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz"; - sha256 = "1d0lhlpdaxycjzpwwrpgjd3v2q2ka89v5rr13ddxayy7ld2hxiaj"; + sha256 = "1vvdb7pfh63kb9fzs6gqp95q550a3ck4cj9mqxlk9wwhkh30dsq1"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 4d6b0511a2ab..c591ef554ee4 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -173,6 +173,10 @@ let gitstatus = callPackage ./gitstatus { }; + gitui = callPackage ./gitui { + inherit (darwin.apple_sdk.frameworks) Security; + }; + grv = callPackage ./grv { }; hub = callPackage ./hub { }; diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix new file mode 100644 index 000000000000..f215b7986f89 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -0,0 +1,24 @@ +{ stdenv, rustPlatform, fetchFromGitHub, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "gitui"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "extrawurst"; + repo = pname; + rev = "v${version}"; + sha256 = "06x4a7ynq6vznjwdm0dhzlj9353skxz65xabwr5xxa85zp2a7vcm"; + }; + + cargoSha256 = "08z3z1m0ik62gzj146a4imk4xx5n8sbvjs0w7gkclvlsvm9dp8q4"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + + meta = with stdenv.lib; { + description = "Blazing fast terminal-ui for git written in rust"; + homepage = "https://github.com/extrawurst/gitui"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index eca841350deb..f5b844d0ce70 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, ronn, installShellFiles }: -buildGoModule rec { +buildGoPackage rec { pname = "git-lfs"; version = "2.10.0"; @@ -11,14 +11,26 @@ buildGoModule rec { sha256 = "1y5ryk0iz5g5sqaw79ml6fr5kvjgzcah481pk5qmnb2ipb1xlng9"; }; - modSha256 = "1rvvgyg4gqbli4pwfnmyz59gf14k7925mdqj6ykp542gwnsjgjp2"; + goPackagePath = "github.com/git-lfs/git-lfs"; + + nativeBuildInputs = [ ronn installShellFiles ]; + + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/config.Vendor=${version} -X ${goPackagePath}/config.GitCommit=${src.rev}" ]; subPackages = [ "." ]; + postBuild = '' + make -C go/src/${goPackagePath} man + ''; + + postInstall = '' + installManPage man/*.1 man/*.5 + ''; + meta = with stdenv.lib; { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; license = [ licenses.mit ]; - maintainers = [ maintainers.twey ]; + maintainers = [ maintainers.twey maintainers.marsam ]; }; } diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 731555ce9f8c..b124ba0ea0ce 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,12 +3,12 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.18"; + version = "4.18.1"; releaseDate = "2019-01-27"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "04sq2sik7j09kgnn1k87yg3vzy56pk4688bmxh49l6drl0wr1m2v"; + sha256 = "07gk5m90v0ih7c18vcwx7p7innsccd09j2vkr99a33wk71xrww1z"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; |