diff options
Diffstat (limited to 'pkgs')
58 files changed, 544 insertions, 393 deletions
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 0c1690f1462a..d9d1a11ce1db 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -10,6 +10,7 @@ let withCD = config.clementine.cd or true; withCloud = config.clementine.cloud or true; + # On the update after all 1.4rc, qt5.15 will be supported. version = "1.4.0rc1"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index b0f464cbfdc8..24f58a6c2c34 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.24"; + version = "1.9.25"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0nrx5fwfij9wajd3lj76hh1yv4zg4q3jc76a76m22djn1njl0n5j"; + sha256 = "0cbgqs17agwdap4g37sb2g6mhyn7qkqbjk7kwb5jvj8nbi5n3kbd"; }; runVend = true; - vendorSha256 = "1qbg44cryiv9kvcak6qjrbmkc9bxyk5fybj62vdkskqfjvv86068"; + vendorSha256 = "08wgah8gxb5bscm5ca6zkfgssnmw2y2l6k9gfw7gbxyflsx74lya"; doCheck = false; diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 16f4aefe349e..fb6753f79a50 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.1.5"; + version = "0.17.1.6"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "0qlcqli0wvrjfy89mbgh1hpmk60dxgn5sws93h8lhgyfwx557iw0"; + sha256 = "0kn5wvx2psbdaqmy1cxlbf5l1mdpvh0b6hh9drah3s7nj3654a3r"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix index b8aa3de44dad..cf0b60ab9856 100644 --- a/pkgs/applications/blockchains/turbo-geth.nix +++ b/pkgs/applications/blockchains/turbo-geth.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "turbo-geth"; - version = "2020.12.01"; + version = "2020.12.02"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "0l1qj10vhfkrk66zihz8m24pnyj8jbb65a7amvphp07r199swy2a"; + sha256 = "0ynnpvpd84qncvzmk4hmq8mn6m14a9p3zg4svijqwlsrr39amp3q"; }; - vendorSha256 = "16vawkky612zf45d8dhipjmhrprmi28z9wdcnjy07x3bxdyfbhfr"; + vendorSha256 = "0sk064iyaxq9ig9xv3h1p1c4994hna9bky16g3hblbnh3v7mmqar"; runVend = true; subPackages = [ diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 5191b916b6c5..c8eb119eb07a 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "vis"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { rev = "v${version}"; - sha256 = "1zjm89cn3rfq8fxpwp66khy53s6vqlmw6q103qyyvix8ydzxdmsh"; + sha256 = "1g05ncsnk57kcqm9wsv6sz8b24kyzj8r5rfpa1wfwj8qkjzx3vji"; repo = "vis"; owner = "martanne"; }; diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index f817a3321606..d0d9f100878f 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -31,10 +31,16 @@ stdenv.mkDerivation rec { }; patches = [ + # Fix version in qtikz.pro (fetchpatch { url = "https://github.com/fhackenberger/ktikz/commit/972685a406517bb85eb561f2c8e26f029eacd7db.patch"; sha256 = "13z40rcd4m4n088v7z2ns17lnpn0z3rzp31lsamic3qdcwjwa5k8"; }) + # Fix missing qt5.15 QPainterPath include + (fetchpatch { + url = "https://github.com/fhackenberger/ktikz/commit/ebe4dfb72ac8a137b475ef688b9f7ac3e5c7f242.patch"; + sha256 = "GIgPh+iUBPftHKIpZR3a0FxmLhMLuPUapF/t+bCuqMs="; + }) ]; nativeBuildInputs = [ pkgconfig qttools qmake wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix new file mode 100644 index 000000000000..e79d989e22d8 --- /dev/null +++ b/pkgs/applications/misc/chrysalis/default.nix @@ -0,0 +1,28 @@ +{ lib, appimageTools, fetchurl }: + +let + pname = "chrysalis"; + version = "0.7.9"; +in appimageTools.wrapType2 rec { + name = "${pname}-${version}-binary"; + + src = fetchurl { + url = "https://github.com/keyboardio/${pname}/releases/download/${pname}-${version}/${pname}-${version}.AppImage"; + sha256 = "12w4vv7dwfpvxpc8kpfas90y7yy8mb8dj2096z3vw1bli5lrn3zi"; + }; + + multiPkgs = null; + extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ + p.glib + ]; + + extraInstallCommands = "mv $out/bin/${name} $out/bin/${pname}"; + + meta = with lib; { + description = "A graphical configurator for Kaleidoscope-powered keyboards"; + homepage = "https://github.com/keyboardio/Chrysalis"; + license = licenses.gpl3; + maintainers = with maintainers; [ aw ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix index e598e099d065..a1e02dbe18e0 100644 --- a/pkgs/applications/misc/mucommander/default.nix +++ b/pkgs/applications/misc/mucommander/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gradle_4_10, perl, makeWrapper, jre, gsettings-desktop-schemas }: +{ stdenv, fetchFromGitHub, gradle_6, perl, makeWrapper, jdk11, gsettings-desktop-schemas }: let version = "0.9.3-3"; @@ -36,7 +36,7 @@ let deps = stdenv.mkDerivation { name = "${name}-deps"; inherit src postPatch; - nativeBuildInputs = [ gradle_4_10 perl ]; + nativeBuildInputs = [ gradle_6 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) gradle --no-daemon build @@ -54,7 +54,7 @@ let in stdenv.mkDerivation { inherit name src postPatch; - nativeBuildInputs = [ gradle_4_10 perl makeWrapper ]; + nativeBuildInputs = [ gradle_6 perl makeWrapper ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -73,7 +73,7 @@ in stdenv.mkDerivation { tar xvf build/distributions/mucommander-${version}.tar --directory=$out --strip=1 wrapProgram $out/bin/mucommander \ --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ - --set JAVA_HOME ${jre} + --set JAVA_HOME ${jdk11} ''; meta = with stdenv.lib; { @@ -81,6 +81,9 @@ in stdenv.mkDerivation { description = "Cross-platform file manager"; license = licenses.gpl3; maintainers = with maintainers; [ volth ]; + # build is broken on MacOS + # https://github.com/NixOS/nixpkgs/pull/105784 + broken = stdenv.isDarwin; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 23c92b2c0881..3b64e601eba6 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "89.0.4343.0", - "sha256": "0jmc1l0lysl5zax98fjhzsfq3c1sqh3n3xscidafflx362wcfpwa", - "sha256bin64": "1v6xik8kf531y0g5xj0c8szjmak0qvh77kwkw7p7hqxqmnwwp06d", + "version": "89.0.4350.4", + "sha256": "1jh3r227j70imjzj0gm7cf1mv25zcdd2waa9qvim0p3g6wbdacmq", + "sha256bin64": "06963r7a1xc9vjlwgn0wgzqfj6mavfks20lzf49axw6izrxf8sbr", "deps": { "gn": { "version": "2020-11-05", diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index cdda1487a497..d4ec9cf5ef30 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.19.4"; + version = "1.19.5"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "05gisihrklkzsdsrrmvmqlfwfdx73jbwd5668n5wa5hp432qyvwi"; + sha256 = "15bv620fj4x731f2z2a9dcdss18rk379kc40g49bpqsdn42jjx2z"; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix new file mode 100644 index 000000000000..656badfe5a0d --- /dev/null +++ b/pkgs/applications/networking/cluster/lens/default.nix @@ -0,0 +1,41 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "lens"; + version = "3.6.7"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.AppImage"; + sha256 = "0var7d31ab6lq2vq6brk2dnhlnhqjp2gdqhygif567cdmcpn4vz8"; + name="${pname}.AppImage"; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; + +in appimageTools.wrapType2 { + inherit name src; + + extraInstallCommands = + '' + mv $out/bin/${name} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/kontena-lens.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/kontena-lens.png \ + $out/share/icons/hicolor/512x512/apps/${pname}.png + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Icon=kontena-lens' 'Icon=${pname}' \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "The Kubernetes IDE"; + homepage = "https://k8slens.dev/"; + license = licenses.mit; + maintainers = with maintainers; [ dbirks ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index 9e37bb6afe25..4ccc05189c9e 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: let - version = "0.16.0"; + version = "0.16.3"; system = stdenv.hostPlatform.system; suffix = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { inherit version; src = fetchsrc { - x86_64-linux = "1i6i42hwxaczkfv8ldxn3wp6bslgwfkycvh88khfmapw2f5f9mhr"; - aarch64-linux = "1ka5vscyqxckxnhnymp06yi0r2ljw42q0g62yq7qv4safljd452p"; - x86_64-darwin = "1c50c2r2hq2fi8jcijq6vn336w96ar7b6qccv5w2240i0szsxxql"; + x86_64-linux = "1c6v7d8i494k32b0zrjn4fn1idza95r6h99c33c5za4hi7gqvy0x"; + aarch64-linux = "153jd4wsq8qc598w7y4d30dy20ljyhrl68cc3pig1p712l5258zs"; + x86_64-darwin = "0y2qjdlyvhrzwg0fmxsr3jl39kd13276a7wg0ndhdjfwxvdwpxkz"; }; doBuild = false; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index bb2a7ab582b9..c015afb787df 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -70,10 +70,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v3.15.0", - "sha256": "0rxpdxg5p478sipbhq2x347gs5wrlwz4ggy9z007cbp34yhb2wka", - "vendorSha256": "0vapfnd4c8jb15pdjnnb97vgsvfakjvl1czccbfy0znhdk2ynz02", - "version": "3.15.0" + "rev": "v3.20.0", + "sha256": "18zccjkdxzcprhpv3cn3b9fbp0h81pkj0dsygfz2islclljc3x17", + "vendorSha256": "0lalcp3wwjbwhp1rwidpndjmilfsc7cb79diicn02a207y277gji", + "version": "3.20.0" }, "azuread": { "owner": "terraform-providers", @@ -748,11 +748,13 @@ "version": "1.2.1" }, "postgresql": { - "owner": "terraform-providers", + "owner": "cyrilgdn", + "provider-source-address": "registry.terraform.io/cyrilgdn/postgresql", "repo": "terraform-provider-postgresql", - "rev": "v1.7.1", - "sha256": "0qlz00svvbwxslp8v7bi7mx5mvnjmh2cvg33a006gh4fy5n75shy", - "version": "1.7.1" + "rev": "v1.8.1", + "sha256": "07qaiy3vmz179am1qrxwvrk7xpraaa8g0hf49bj54pw7nkrmaixq", + "vendorSha256": null, + "version": "1.8.1" }, "powerdns": { "owner": "terraform-providers", diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 2f5316c9fe27..80ffbebe9be3 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -17,6 +17,7 @@ , mtxclient , boost17x , spdlog +, fmt , olm , pkgconfig , nlohmann_json @@ -47,6 +48,7 @@ mkDerivation rec { boost17x lmdb spdlog + fmt cmark qtbase qtmultimedia diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 84f090228627..05d94b2ef715 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.38.2"; # Please backport all updates to the stable channel. + version = "1.39.2"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1lq830760y4kmhqd29hhgnab6lryiipb01y0c5bbl886zk3z35n4"; + sha256 = "15lv8jpnn2cx7hmb7pn32cvq6nqvzjflf77bbnvxva5hf9zjkma9"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index 2890deccb800..3c80ef09aaf7 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix< |