diff options
Diffstat (limited to 'pkgs')
18 files changed, 267 insertions, 63 deletions
diff --git a/pkgs/applications/misc/dmrconfig/default.nix b/pkgs/applications/misc/dmrconfig/default.nix index 20c6ff57b241..9edf5e4f88c2 100644 --- a/pkgs/applications/misc/dmrconfig/default.nix +++ b/pkgs/applications/misc/dmrconfig/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "dmrconfig-${version}"; - version = "2018-10-20"; + version = "2018-10-29"; src = fetchFromGitHub { owner = "sergev"; repo = "dmrconfig"; - rev = "a4c5f893d2749727493427320c7f01768966ba51"; - sha256 = "0h7hv6fv6v5g922nvgrb0w7hsqbhaw7xmdc6vydh2p3l7sp31vg2"; + rev = "4924d00283c3c81a4b8251669e42aecd96b6145a"; + sha256 = "00a4hmbr71g0d4faskb8q96y6z212g2r4n533yvp88z8rq8vbxxn"; }; buildInputs = [ diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix index 66d28cbcaf3e..610e367b09f8 100644 --- a/pkgs/desktops/deepin/dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dbus-factory/default.nix @@ -18,7 +18,11 @@ stdenv.mkDerivation rec { go-dbus-generator ]; - makeFlags = [ "GOPATH=$(out)/share/gocode" ]; + makeFlags = [ "GOPATH=$(out)/share/go" ]; + + postPatch = '' + sed -i -e 's:/share/gocode:/share/go:' Makefile + ''; meta = with stdenv.lib; { description = "Generates static DBus bindings for Golang and QML at build-time"; diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix new file mode 100644 index 000000000000..fe2c5f8f55a1 --- /dev/null +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -0,0 +1,90 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, + dbus-factory, go-dbus-factory, go-gir-generator, go-lib, + deepin-gettext-tools, dde-api, alsaLib, glib, gtk3, libinput, libnl, + librsvg, linux-pam, networkmanager, pulseaudio, xorg, gnome3, + python3Packages, hicolor-icon-theme, go }: + +buildGoPackage rec { + name = "${pname}-${version}"; + pname = "dde-daemon"; + version = "3.2.24.7"; + + goPackagePath = "pkg.deepin.io/dde/daemon"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "17dvhqrw0dqy3d0wd9ailb18y2rg7575g3ffy0d5rg9m3y65y1y6"; + }; + + patches = [ + # https://github.com/linuxdeepin/dde-daemon/issues/51 + (fetchpatch { + name = "dde-daemon_3.2.3.patch"; + url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.2.3.patch; + sha256 = "0a3xb15czpfl2vajpf7ycw37vr7fbw2png1a67mvjjkgx7d1k7dg"; + }) + ]; + + goDeps = ./deps.nix; + + outputs = [ "out" ]; + + nativeBuildInputs = [ + pkgconfig + dbus-factory + go-dbus-factory + go-gir-generator + go-lib + deepin-gettext-tools + dde-api + linux-pam + networkmanager + networkmanager.dev + python3Packages.python + ]; + + buildInputs = [ + alsaLib + glib + gnome3.libgudev + gtk3 + hicolor-icon-theme + libinput + libnl + librsvg + pulseaudio + ]; + + postPatch = '' + patchShebangs . + + sed -i network/nm_generator/Makefile -e 's,/usr/share/gir-1.0/NM-1.0.gir,${networkmanager.dev}/share/gir-1.0/NM-1.0.gir,' + + sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile + sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile + sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile + + find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} + + ''; + + buildPhase = '' + make -C go/src/${goPackagePath} + # compilation of the nm module is failing + #make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code + ''; + + installPhase = '' + make install PREFIX="$out" -C go/src/${goPackagePath} + remove-references-to -t ${go} $out/lib/deepin-daemon/* + ''; + + meta = with stdenv.lib; { + description = "Daemon for handling Deepin Desktop Environment session settings"; + homepage = https://github.com/linuxdeepin/dde-daemon; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/dde-daemon/deps.nix b/pkgs/desktops/deepin/dde-daemon/deps.nix new file mode 100644 index 000000000000..5ffecc28882d --- /dev/null +++ b/pkgs/desktops/deepin/dde-daemon/deps.nix @@ -0,0 +1,102 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/axgle/mahonia"; + fetch = { + type = "git"; + url = "https://github.com/axgle/mahonia"; + rev = "3358181d7394e26beccfae0ffde05193ef3be33a"; + sha256 = "0b8wsrxmv8a0cqbnsg55lpf29pxy2zw8azvgh3ck664lqpcfybhq"; + }; + } + { + goPackagePath = "github.com/cryptix/wav"; + fetch = { + type = "git"; + url = "https://github.com/cryptix/wav"; + rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44"; + sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6"; + }; + } + { + goPackagePath = "github.com/linuxdeepin/go-x11-client"; + fetch = { + type = "git"; + url = "https://github.com/linuxdeepin/go-x11-client"; + rev = "8f12fd35ff10b391f0321aa41b94db6acd951ea3"; + sha256 = "1axxzzhbiwvi76d19bix3zm5wv3qmlq0wgji9mwjbmkb4bvp0v3d"; + }; + } + { + goPackagePath = "github.com/msteinert/pam"; + fetch = { + type = "git"; + url = "https://github.com/msteinert/pam"; + rev = "f4cd9f5e29232537a12db1678f48c702ad6896b7"; + sha256 = "1vjawxswy3f23v4d72kk95y3b557580670ai9ffvrwy6wy85qync"; + }; + } + { + goPackagePath = "github.com/nfnt/resize"; + fetch = { + type = "git"; + url = "https://github.com/nfnt/resize"; + rev = "83c6a9932646f83e3267f353373d47347b6036b2"; + sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya"; + }; + } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/image"; + rev = "991ec62608f3c0da01d400756917825d1e2fd528"; + sha256 = "0jipi9czjczi6hlqb5kchgml8r6h6qyb4gqrb0nnb63m25510019"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "04a2e542c03f1d053ab3e4d6e5abcd4b66e2be8e"; + sha256 = "040i9f6ymj4z25957h20id9kfmlrcp35y4sfd99hngw9li50ihql"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "4d1c5fb19474adfe9562c9847ba425e7da817e81"; + sha256 = "1y4rf9cmjyf8r56khr1sz0chbq1v0ynaj63i2z1mq6k6h6ww45da"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } +] diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index a36a96771904..c46dea2875ad 100644 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { name = "deepin-gtk-theme-${version}"; - version = "17.10.8"; + version = "17.10.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-gtk-theme"; rev = version; - sha256 = "1z5f5dnda18gixkjcxpvsavhv9m5l2kq61958fdfm1idi0cbr7fp"; + sha256 = "02yn76h007hlmrd7syd82f0mz1c79rlkz3gy1w17zxfy0gdvagz3"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; makeFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with stdenv.lib; { description = "Deepin GTK Theme"; homepage = https://github.com/linuxdeepin/deepin-gtk-theme; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = licenses.lgpl3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 86e5fc37fa54..a6163cd32e20 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -6,6 +6,7 @@ let dbus-factory = callPackage ./dbus-factory { }; dde-api = callPackage ./dde-api { }; dde-calendar = callPackage ./dde-calendar { }; + dde-daemon = callPackage ./dde-daemon { }; dde-polkit-agent = callPackage ./dde-polkit-agent { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; dde-session-ui = callPackage ./dde-session-ui { }; diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix index a488bd7202cb..b9b3aa59a0b1 100644 --- a/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { sha256 = "0gj2xxv45gh7wr5ry3mcsi46kdsyq9nbd7znssn34kapiv40ixcx"; }; - makeFlags = [ - "PREFIX=$(out)" - ]; + makeFlags = [ "PREFIX=$(out)" ]; + + postPatch = '' + sed -i -e 's:/share/gocode:/share/go:' Makefile + ''; meta = with stdenv.lib; { description = "GoLang DBus factory for the Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix index 2933c58f8d95..fa38e650c3a9 100644 --- a/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" - "GOPATH=$(GGOPATH):${go-lib}/share/gocode" - "HOME=$(TMP)" + "GOCACHE=off" ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix index 44de8889df28..ff9394425e08 100644 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "go-lib"; - version = "1.2.16.1"; + version = "1.2.16.3"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0nl35dm0bdca38qhnzdpsv6b0vds9ccvm4c86rs42a7c6v655b1q"; + sha256 = "0dk6k53in3ffwwvkr0sazfk83rf4fyc6rvb6k8fi2n3qj4gp8xd2"; }; buildInputs = [ @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { mobile-broadband-provider-info ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "PREFIX=$(out)" + "GOSITE_DIR=$(out)/share/go" + ]; meta = with stdenv.lib; { description = "Go bindings for Deepin Desktop Environment development"; diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index 3f08ca8f7c22..02ce07bdf471 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -2,20 +2,20 @@ pythonPackages.buildPythonApplication rec { name = "hy-${version}"; - version = "0.14.0"; + version = "0.15.0"; src = fetchurl { url = "mirror://pypi/h/hy/${name}.tar.gz"; - sha256 = "0cbdh1q0zm00p4h7i44kir4qhw0p6sid78xf6llrx2p21llsnv98"; + sha256 = "01vzaib1imr00j5d7f7xk44v800h06s3yv9inhlqm6f3b25ywpl1"; }; - propagatedBuildInputs = with pythonPackages; [ appdirs clint astor rply ]; - - # The build generates a .json parser file in the home directory under .cache. - # This is needed to get it to not try and open files in /homeless-shelter - preConfigure = '' - export HOME=$TMP - ''; + propagatedBuildInputs = with pythonPackages; [ + appdirs + astor + clint + funcparserlib + rply + ]; meta = { description = "A LISP dialect embedded in Python"; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 7c3b3447d613..d11ef732a01f 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg -, libssh, libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr +, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex , openglSupport ? false, libGLU_combined ? null # Build options @@ -130,6 +130,7 @@ stdenv.mkDerivation rec { "--enable-libtheora" (ifMinVer "2.1" "--enable-libssh") (ifMinVer "0.6" (enableFeature vaapiSupport "vaapi")) + (ifMinVer "3.4" (enableFeature vaapiSupport "libdrm")) "--enable-vdpau" "--enable-libvorbis" (ifMinVer "0.6" (enableFeature vpxSupport "libvpx")) @@ -165,6 +166,7 @@ stdenv.mkDerivation rec { ++ optional vpxSupport libvpx ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva + ++ optional ((isLinux || isFreeBSD) && !isAarch32) libdrm ++ optional isLinux alsaLib ++ optionals isDarwin darwinFrameworks ++ optional vdpauSupport libvdpau diff --git a/pkgs/misc/themes/matcha/default.nix b/pkgs/misc/themes/matcha/default.nix index 9967de786399..6e14d1587a75 100644 --- a/pkgs/misc/themes/matcha/default.nix +++ b/pkgs/misc/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "matcha-${version}"; - version = "2018-10-21"; + version = "2018-10-30"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "matcha"; rev = version; - sha256 = "112xfnwlq9ih72qbfrin78ly7bc4i94my3i6s7yhc46qg1lncl73"; + sha256 = "1ks30xm7jhyxgs0blxxnc9ygmyfwrwc9k8d0y0i6yb7608p8zxzq"; }; buildInputs = [ gdk_pixbuf librsvg ]; diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index e3463246ab2c..55e126d64a5d 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -34,8 +34,8 @@ let name = "cpptools-language-component-binaries"; src = fetchzip { - url = https://download.visualstudio.microsoft.com/download/pr/11991016/8a81aa8f89aac452956b0e4c68e6620b/Bin_Linux.zip; - sha256 = "0ma59fxfldbgh6ijlvfbs3hnl4g0cnw5gs6286zdrp065n763sv4"; + url = "https://download.visualstudio.microsoft.com/download/pr/e8bc2ccc-bb10-4d40-8e29-edcd78986e9a/2e86fa29aefdbde2ea2cd1a6fceadeaa/bin_linux.zip"; + sha256 = "1hvrbp3c4733aryslgyh3l5azmqkw398j2wbgr3w788fphg4v6cc"; }; patchPhase = '' @@ -81,7 +81,7 @@ vscode-utils.buildVscodeMarketplaceExtension { # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime. # 2. Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. cat ./package_ori.json | \ - jq --slurpfile actEvts ${./package-activation-events-0-16-1.json} '(.activationEvents) = $actEvts[0]' | \ + jq --slurpfile actEvts ${./package-activation-events.json} '(.activationEvents) = $actEvts[0]' | \ jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \ ./package.json diff --git a/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json b/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json deleted file mode 100644 index 3a12a8bc0474..000000000000 --- a/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json +++ /dev/null @@ -1,22 +0,0 @@ -[ -"onLanguage:cpp", -"onLanguage:c", -"onCommand:extension.pickNativeProcess", -"onCommand:extension.pickRemoteNativeProcess", -"onCommand:C_Cpp.ConfigurationEdit", -"onCommand:C_Cpp.ConfigurationSelect", -"onCommand:C_Cpp.SwitchHeaderSource", -"onCommand:C_Cpp.Navigate", -"onCommand:C_Cpp.GoToDeclaration", -"onCommand:C_Cpp.PeekDeclaration", -"onCommand:C_Cpp.ToggleErrorSquiggles", -"onCommand:C_Cpp.ToggleIncludeFallback", -"onCommand:C_Cpp.ToggleDimInactiveRegions", -"onCommand:C_Cpp.ShowReleaseNotes", -"onCommand:C_Cpp.ResetDatabase", -"onCommand:C_Cpp.PauseParsing", -"onCommand:C_Cpp.ResumeParsing", -"onCommand:C_Cpp.ShowParsingCommands", -"onCommand:C_Cpp.TakeSurvey", -"onDebug" -] \ No newline at end of file diff --git a/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json b/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json new file mode 100644 index 000000000000..c2d8a10f340a --- /dev/null +++ b/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json @@ -0,0 +1,25 @@ +[ + "onLanguage:cpp", + "onLanguage:c", + "onCommand:extension.pickNativeProcess", + "onCommand:extension.pickRemoteNativeProcess", + "onCommand:C_Cpp.ConfigurationEdit", + "onCommand:C_Cpp.ConfigurationSelect", + "onCommand:C_Cpp.ConfigurationProviderSelect", + "onCommand:C_Cpp.SwitchHeaderSource", + "onCommand:C_Cpp.Navigate", + "onCommand:C_Cpp.GoToDeclaration", + "onCommand:C_Cpp.PeekDeclaration", + "onCommand:C_Cpp.ToggleErrorSquiggles", + "onCommand:C_Cpp.ToggleIncludeFallback", + "onCommand:C_Cpp.ToggleDimInactiveRegions", + "onCommand:C_Cpp.ToggleSnippets", + "onCommand:C_Cpp.ShowReleaseNotes", + "onCommand:C_Cpp.ResetDatabase", + "onCommand:C_Cpp.PauseParsing", + "onCommand:C_Cpp.ResumeParsing", + "onCommand:C_Cpp.ShowParsingCommands", + "onCommand:C_Cpp.TakeSurvey", + "onDebug", + "workspaceContains:/.vscode/c_cpp_properties.json" +] diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 04fd2e37b357..97612f656cbc 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "osrm-backend-${version}"; - version = "5.18.0"; + version = "5.19.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "Project-OSRM"; repo = "osrm-backend"; - sha256 = "0ffdw02rgjb4z7xi8fk97c0hl1i7z04csjh3yd18zsb19bk1mkva"; + sha256 = "1y3k2j4c3jparzm9ck1jkw5g12jr6kd9llq50jran2dwikc6hpyz"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 016ea957f6c7..aa8cc12ece85 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -19,18 +19,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "1d5z575vw07jk7528bsqgdd875b3zwayrdnidvxpd2n8j4bip654"; + sha256 = "03ymvfhk8azyvdm6j4pbqx2fsh178kw81yqwkycbhmm6mnyc8yv1"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "0ljslvp68ml5mglrl7kakgkqskbzglf3i5jv5d7jld28d0kbzj2c"; + sha256 = "1pw4w3v81mp8alm6vxq10242xxwv8rfs59bjxrmy0pfkjgsr4x4v"; }; }.${system}; in stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "215.0.0"; + version = "222.0.0"; src = fetchurl (sources name stdenv.hostPlatform.system); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1ab34eba6f2..80864ab1ce6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22720,9 +22720,7 @@ with pkgs; tomb = callPackage ../os-specific/linux/tomb {}; - tomboy = callPackage ../applications/misc/tomboy { - mono = mono46; - }; + tomboy = callPackage ../applications/misc/tomboy { }; imatix_gsl = callPackage ../development/tools/imatix_gsl {}; |