diff --git a/nixos/modules/services/misc/matrix-synapse.xml b/nixos/modules/services/misc/matrix-synapse.xml index 5544c2035fb7..358b631eb485 100644 --- a/nixos/modules/services/misc/matrix-synapse.xml +++ b/nixos/modules/services/misc/matrix-synapse.xml @@ -206,7 +206,7 @@ Success! root = pkgs.element-web.override { conf = { default_server_config."m.homeserver" = { - "base_url" = "${config.networking.domain}"; + "base_url" = "https://${fqdn}"; "server_name" = "${fqdn}"; }; }; diff --git a/nixos/modules/services/monitoring/grafana-image-renderer.nix b/nixos/modules/services/monitoring/grafana-image-renderer.nix index a010a5316bae..b8b95d846c6a 100644 --- a/nixos/modules/services/monitoring/grafana-image-renderer.nix +++ b/nixos/modules/services/monitoring/grafana-image-renderer.nix @@ -122,7 +122,7 @@ in { timezone = config.time.timeZone; }; - services = { + service = { logging.level = mkIf cfg.verbose (mkDefault "debug"); metrics.enabled = mkDefault false; }; diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix index 63d15e813afe..5c969fc9c917 100644 --- a/nixos/tests/mpd.nix +++ b/nixos/tests/mpd.nix @@ -107,7 +107,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: for track in tracks.splitlines(): server.succeed(f"{mpc} add {track}") - _, added_tracks = server.execute(f"{mpc} listall") + _, added_tracks = server.execute(f"{mpc} playlist") # Check we succeeded adding audio tracks to the playlist assert len(added_tracks.splitlines()) > 0 diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix index ffe9e549eb23..db8f8ad793a2 100644 --- a/pkgs/applications/audio/bchoppr/default.nix +++ b/pkgs/applications/audio/bchoppr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bchoppr"; - version = "1.8.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "1nd6byy75f0rbz9dm9drhxmpsfhxhg0y7q3v2m3098llynhy9k2j"; + sha256 = "sha256-LYndZhg4ILN0E8aRqgUBFzzzLv88TMSXG2OeFxImDu0="; }; nativeBuildInputs = [ pkg-config ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = https://github.com/sjaehn/BChoppr; + homepage = "https://github.com/sjaehn/BChoppr"; description = "An audio stream chopping LV2 plugin"; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/bschaffl/default.nix b/pkgs/applications/audio/bschaffl/default.nix index c8fae58ac2fb..6b0ca55f27f1 100644 --- a/pkgs/applications/audio/bschaffl/default.nix +++ b/pkgs/applications/audio/bschaffl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bschaffl"; - version = "1.2.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "1c09acqrbd387ba41f8ch1qykdap5h6cg9if5pgd16i4dmjnpghj"; + sha256 = "sha256-R6QTADPE2PW/ySQla2lQbb308jrHXZ43DpFxUfQ0/NY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/midi-visualizer/default.nix b/pkgs/applications/audio/midi-visualizer/default.nix index 58f8fee3cefc..ec6fd4d8ed93 100644 --- a/pkgs/applications/audio/midi-visualizer/default.nix +++ b/pkgs/applications/audio/midi-visualizer/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "MIDIVisualizer"; - version = "6.0"; + version = "6.2"; src = fetchFromGitHub { owner = "kosua20"; repo = pname; rev = "v${version}"; - sha256 = "052zpabkbkqzqzf8r6mdq9p6arn9mr1ywx6x3y9rqxj6sfprxd65"; + sha256 = "sha256-t7DRPV0FSg6v81GzHLK2O++sfjr2aFT+xg3+wFd0UFg="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper]; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 2159fa630d92..8d495b936292 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/ - mv $out/AudioPluginServer* $out/lib/ - cp renoise $out/renoise for path in ${toString buildInputs}; do @@ -56,6 +54,13 @@ stdenv.mkDerivation rec { --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath ${mpg123}/lib:$out/lib \ $out/renoise + + for path in $out/AudioPluginServer*; do + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath $out/lib \ + $path + done ''; meta = { diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix index ba7ebfcfdff6..133deec19521 100644 --- a/pkgs/applications/graphics/emulsion/default.nix +++ b/pkgs/applications/graphics/emulsion/default.nix @@ -38,16 +38,16 @@ let in rustPlatform.buildRustPackage rec { pname = "emulsion"; - version = "7.2"; + version = "8.0"; src = fetchFromGitHub { owner = "ArturKovacs"; repo = pname; rev = "v${version}"; - sha256 = "1king04p5j4gsvprrfppwaxa5jn4ga4nc0v63wl6fvq2ngwnkg4g"; + sha256 = "sha256-xv3q59HobunrFyc+CPLztpsQd20Eu4+JI+iYhlGI0bc="; }; - cargoSha256 = "19vb2q5w3063l7349p1b8q40n97a4hxdvc7h7qsx1iiwp75knbd0"; + cargoSha256 = "sha256-37xtdFbtbfGUqaSpzlxDQfe1+0ESHz/rgO1iTPBEBLc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 7cd31adfa32a..4d2ef2254e13 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -1,15 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config -, boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK31 -, gtest, nlopt, xorg, makeDesktopItem -, cgal_5, gmp, ilmbase, mpfr, qhull, openvdb, systemd +{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem, pkg-config, wrapGAppsHook +, boost, cereal, cgal_5, curl, dbus, eigen, expat, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme +, ilmbase, libpng, mpfr, nlopt, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg }: stdenv.mkDerivation rec { pname = "prusa-slicer"; - version = "2.2.0"; + version = "2.3.0"; nativeBuildInputs = [ cmake + copyDesktopItems pkg-config + wrapGAppsHook ]; buildInputs = [ @@ -17,21 +18,27 @@ stdenv.mkDerivation rec { cereal cgal_5 curl + dbus eigen expat glew + glib gmp + gtk3 + hicolor-icon-theme ilmbase libpng mpfr nlopt openvdb + pcre systemd tbb - wxGTK31 + wxGTK31-gtk3 xorg.libX11 ] ++ checkInputs; + doCheck = true; checkInputs = [ gtest ]; # The build system uses custom logic - defined in @@ -62,30 +69,43 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - sha256 = "0954k9sm09y8qnz1jyswyysg10k54ywz8mswnwa4n2hnpq9qx73m"; + sha256 = "08zyvik8cyj1n9knbg8saan7j8s60nzkyj4a77818zbi9lpi65i5"; rev = "version_${version}"; }; cmakeFlags = [ "-DSLIC3R_FHS=1" + "-DSLIC3R_GTK=3" ]; postInstall = '' + ln -s "$out/bin/prusa-slicer" "$out/bin/prusa-gcodeviewer" + mkdir -p "$out/share/pixmaps/" ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png" - mkdir -p "$out/share/applications" - cp "$desktopItem"/share/applications/* "$out/share/applications/" + ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_192px.png" "$out/share/pixmaps/PrusaSlicer-gcodeviewer.png" ''; - desktopItem = makeDesktopItem { - name = "PrusaSlicer"; - exec = "prusa-slicer"; - icon = "PrusaSlicer"; - comment = "G-code generator for 3D printers"; - desktopName = "PrusaSlicer"; - genericName = "3D printer tool"; - categories = "Development;"; - }; + desktopItems = [ + (makeDesktopItem { + name = "PrusaSlicer"; + exec = "prusa-slicer"; + icon = "PrusaSlicer"; + comment = "G-code generator for 3D printers"; + desktopName = "PrusaSlicer"; + genericName = "3D printer tool"; + categories = "Development;"; + }) + (makeDesktopItem { + name = "PrusaSlicer G-code Viewer"; + exec = "prusa-gcodeviewer"; + icon = "PrusaSlicer-gcodeviewer"; + comment = "G-code viewer for 3D printers"; + desktopName = "PrusaSlicer G-code Viewer"; + genericName = "G-code Viewer"; + categories = "Development;"; + }) + ]; meta = with lib; { description = "G-code generator for 3D printer"; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index eed3bfc9c313..14894159843b 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -24,19 +24,19 @@ let postInstall = '' mkdir -p "$out/share/pixmaps/" ln -s "$out/share/SuperSlicer/icons/Slic3r.png" "$out/share/pixmaps/${appname}.png" - mkdir -p "$out/share/applications" - cp "$desktopItem"/share/applications/* "$out/share/applications/" ''; - desktopItem = makeDesktopItem { - name = appname; - exec = "superslicer"; - icon = appname; - comment = description; - desktopName = appname; - genericName = "3D printer tool"; - categories = "Development;"; - }; + desktopItems = [ + (makeDesktopItem { + name = appname; + exec = "superslicer"; + icon = appname; + comment = description; + desktopName = appname; + genericName = "3D printer tool"; + categories = "Development;"; + }) + ]; meta = with lib; { inherit description; diff --git a/pkgs/applications/misc/remarkable/rmview/default.nix b/pkgs/applications/misc/remarkable/rmview/default.nix new file mode 100644 index 000000000000..3148bf0ccf39 --- /dev/null +++ b/pkgs/applications/misc/remarkable/rmview/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: + +python3Packages.buildPythonApplication rec { + pname = "rmview"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "bordaigorl"; + repo = pname; + rev = "v${version}"; + sha256 = "0zyngirpg808k1pkyhrk43qr3i8ilvfci0wzwk4b5f6f9cmjs7kb"; + }; + + nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ]; + propagatedBuildInputs = with python3Packages; [ pyqt5 paramiko twisted ]; + + preBuild = '' + pyrcc5 -o src/rmview/resources.py resources.qrc + ''; + + preFixup = '' + wrapQtApp "$out/bin/rmview" + ''; + + meta = with lib; { + description = "Fast live viewer for reMarkable 1 and 2"; + homepage = "https://github.com/bordaigorl/rmview"; + license = licenses.gpl3Only; + maintainers = [ maintainers.nickhu ]; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index f01f835e436d..eb5baf1902e0 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,9 +44,9 @@ } }, "ungoogled-chromium": { - "version": "87.0.4280.88", - "sha256": "1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy", - "sha256bin64": "0n3fm6wf8zfkv135d50xl8xxrnng3q55vyxkck1da8jyvh18bijb", + "version": "87.0.4280.141", + "sha256": "0x9k809m36pfirnw2vnr9pk93nxdbgrvna0xf1rs3q91zkbr2x8l", + "sha256bin64": "0wq3yi0qyxzcid390w5rh4xjq92fjajvlifjl70g6sqnbk6vgvdp", "deps": { "gn": { "version": "2020-09-09", @@ -55,8 +55,8 @@ "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" }, "ungoogled-patches": { - "rev": "87.0.4280.88-1", - "sha256": "0w2137w8hfcgl6f938hqnb4ffp33v5r8vdzxrvs814w7dszkiqgg" + "rev": "87.0.4280.141-1", + "sha256": "0r09d27jrdz01rcwifchbq7ksh2bac15h8svq18jx426mr56dzla" } } } diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index ad2d69edd4e0..cff93e196a64 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "7.0.4"; + version = "7.0.5"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "18chvfdmka21zvjgqfpinm3nrj0ba09szxhhm39anpvpbj92ra8j"; + sha256 = "sha256-dets4YoTUgFCDOrvzNuAwJb3/MsnjOSBx9PBZuT0ruk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 2b5f7a0e663f..2f0b53f248d6 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2020.11.11"; + version = "2021.1.4"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "059q0k53n8cc78cg70pw7dnbc1cjzv3kdvw3cfamvkrmscqgczxd"; + sha256 = "sha256-k10Cex2dEFF2l3qq/pK1UcfMBE4jScLD/oieQ/di0gY="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index 904fd90e102e..ee0b561e675e 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "firehol"; - version = "3.1.6"; + version = "3.1.7"; src = fetchFromGitHub { owner = "firehol"; repo = "firehol"; rev = "v${version}"; - sha256 = "0l7sjpsb300kqv21hawd26a7jszlmafplacpn5lfj64m4yip93fd"; + sha256 = "sha256-gq7l7QoUsK+j5DUn84kD9hlUTC4hz3ds3gNJc1tRygs="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 7a735e59dcbd..f6fa30e91e5b 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.16", + "version": "1.7.17", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -57,12 +57,12 @@ "tar": "^6.0.1" }, "hakDependencies": { - "matrix-seshat": "^2.2.1", + "matrix-seshat": "^2.2.3", "keytar": "^5.6.0" }, "build": { "appId": "im.riot.app", - "electronVersion": "10.1.6", + "electronVersion": "10.2.0", "files": [ "package.json", { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index cc5931f08edc..fcd06326e213 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.16"; + version = "1.7.17"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-mdHsw1Vi+2hrAF7biX3pJqfRaZU2lpw9zUZdcCm717g="; + sha256 = "sha256-3GFfldQoD5plIeuAOd4OcB/q7m8tKU6so+M8MlB6Uuc="; }; in mkYarnPackage rec { name = "element-desktop-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 073ac43f5f30..173977155e81 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.16"; + version = "1.7.17"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-/KLTD7IvIp1f1dSUEMMCoknQzZarcP2wDM211h+OJMM="; + sha256 = "sha256-9DyA3h0sQCzOFZ9gEReJrMQOnygFvEB7PeIpkG/F5H4="; }; installPhase = '' diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix index 7a7e3f13c7a3..efaa4403f41d 100644 --- a/pkgs/applications/science/biology/delly/default.nix +++ b/pkgs/applications/science/biology/delly/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "delly"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "dellytools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j9klZ8qq1GQS7+zZ+vHwAwLHBYMBrWfbwqeD8QJeCuk="; + sha256 = "sha256-DWwC35r8cQbePUzppkFQlev0YZdxk2+BSrNTW/DOY3M="; }; buildInputs = [ zlib htslib bzip2 lzma ncurses boost ]; diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 7a7da2c5f5d2..d094019dbe92 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "kha"; repo = "elan"; rev = "v${version}"; - sha256 = "0ycw1r364g5gwh8796dpv1israpg7zqwx8mcvnacv2lqj5iijmby"; + sha256 = "sha256-YkGfuqtvVfPcxJ8UqD5QidcNEy5brTWGEK4fR64Yz70="; }; - cargoSha256 = "0hcaiy046d2gnkp6sfpnkkprb3nd94i9q8dgqxxpwrc1j157x6z9"; + cargoSha256 = "sha256-2fYicpoEERwD4OjdpseKQOkDvZlb7NnOZcb6Tu+rQdA="; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix index 923c2a67b425..3e6a06db1a86 100644 --- a/pkgs/applications/video/droidcam/default.nix +++ b/pkgs/applications/video/droidcam/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "droidcam"; - version = "1.7"; + version = "1.7.1"; src = fetchFromGitHub { owner = "aramg"; repo = "droidcam"; rev = "v${version}"; - sha256 = "sha256-nIqiRWk3gKOWrreyLVT8McRsXClXjOa4y8xXr1ox9Lc="; + sha256 = "sha256-f7wLi4ReExkqb+SfOK0juzKbwdcqUVkklIUOIMtmnxM="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index bd4e43ff5edc..dfcd2f596797 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "elementary-xfce"; rev = "v${version}"; - sha256 = "1rl15kh9c7qxw4pvwmw44fb4v3vwh6zin4wpx55bnvm5j76y6p3f"; + sha256 = "sha256-E8f6UU/4Y9Nfk7LjDcdyV+TdeVj/zl3oFCyEu3Gz27w="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix b/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix index 6c1d6512adc6..c83ad7ef4c19 100644 --- a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix +++ b/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-night-theme-switcher"; - version = "36"; + version = "40"; src = fetchFromGitLab { owner = "rmnvgr"; repo = "nightthemeswitcher-gnome-shell-extension"; rev = "v${version}"; - sha256 = "1c88979qprwb5lj0v7va017w7rdr89a648anhw4k5q135jwyskpz"; + sha256 = "0z11y18bgdc0y41hrrzzgi4lagm2cg06x12jgdnary1ycng7xja0"; }; buildInputs = [ glib gnome3.gnome-shell unzip ]; diff --git a/pkgs/development/interpreters/elixir/1.11.nix b/pkgs/development/interpreters/elixir/1.11.nix index 8f9d869abf3c..4e50c737e39b 100644 --- a/pkgs/development/interpreters/elixir/1.11.nix +++ b/pkgs/development/interpreters/elixir/1.11.nix @@ -3,7 +3,7 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz mkDerivation { - version = "1.11.2"; - sha256 = "0b4nfgxhmi4gwba9h9k103zrkpbxxvk0gmdl0ggrd5xlg6v288ky"; + version = "1.11.3"; + sha256 = "sha256-DqmKpMLxrXn23fsX/hrjDsYCmhD5jbVtvOX8EwKBakc="; minimumOTPVersion = "21"; } diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index 4e41f39b49b1..68c166911833 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.13.3"; + version = "2.13.4"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="0m7pwsam1nb93akgnf5fxi737pgbrbcj0y28bavhzcss7yrm4gys"; + sha256="sha256-8tR8MCFYK5XXtJQaIuZ59PJ3h3UYbfXKkaOfcBRt1Xo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 08940b4800df..9ab3a261da5b 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.9.0"; + version = "5.10.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "0lcbvmighmc03qxcf03vqmn6188wx4dr3m9d5ldxm2v7mw5xbq82"; + sha256 = "sha256-ZqpgnxI6Py+Xrf+MK852j+kE2JGFz15kWAXOqy+bjVc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 1befa89c7d05..9f12da6b0ede 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "cutelyst"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "1xbw8ag3iwm69dhrsg54anrlzvvflj6pwsj42z6hrl0yckabn99z"; + sha256 = "sha256-RidUZqDnzRrgW/7LVF+BF01zNcf1cJ/kS7OF/t1Q65c="; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/default.nix index bdf4519f9bc3..228fec2f8188 100644 --- a/pkgs/development/libraries/czmq/default.nix +++ b/pkgs/development/libraries/czmq/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, zeromq }: stdenv.mkDerivation rec { - version = "4.2.0"; + version = "4.2.1"; pname = "czmq"; src = fetchurl { url = "https://github.com/zeromq/czmq/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1szciz62sk3fm4ga9qjpxz0n0lazvphm32km95bq92ncng12kayg"; + sha256 = "sha256-XXIKIEwqWGRdb3ZDrxXVY6cS2tmMnTLB7ZEzd9qmrDk="; }; # Needs to be propagated for the .pc file to work diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index 29fdd0689593..0c3205277841 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -4,12 +4,12 @@ { stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { pname = "easyloggingpp"; - version = "9.96.7"; + version = "9.97.0"; src = fetchFromGitHub { owner = "muflihun"; repo = "easyloggingpp"; rev = "v${version}"; - sha256 = "0nhszn0yyjwpnv7swm4vqs3i7admgbnifi5dvq5h01fk5nc8yjqz"; + sha256 = "sha256-sFWmZMnucMuvpwDzuowni21KiD3bx0lH1Ts+yhusOYs="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index 05abb1f2aa51..43c9f5a9380a 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ethash"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "chfast"; repo = "ethash"; rev = "v${version}"; - sha256 = "0shr3m33raxy9j2mpm3q9mdbchs3nhgfaywidyxgmwqaiw1xpyif"; + sha256 = "sha256-N30v9OZwTmDbltPPmeSa0uOGJhos1VzyS5zY9vVCWfA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 02544d74782e..4a565e3fccc8 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.12"; + version = "21.01"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "1iwfsfbd2ji7lkk5fh0wla287gph0sadlf0pz2j0vyddpkvr0xgx"; + sha256 = "sha256-D7nlwQnz2JPRB3JrrkyUcaaf4Ro/+Ap8sqq5Oz8naHw="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 7d0eb7f67dd8..2768c20d6576 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "librelp"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "rsyslog"; repo = "librelp"; rev = "v${version}"; - sha256 = "132i1b1m7c7hkbxsnpa7n07cbghxjxmcbb8zhgwziaxg4nzxsa6l"; + sha256 = "0miqjck9zh1hgsx1v395n0d4f1a1p5a8khybv2nsfjq04g9359c9"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index 2e6b36446285..2f7740aa467e 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -9,13 +9,13 @@ assert enableGrpc -> c-ares != null; stdenv.mkDerivation rec { pname = "lightstep-tracer-cpp"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lightstep"; repo = pname; rev = "v${version}"; - sha256 = "0d7z9isf0n8s63mvp3j75949w0yv7jsva29i62lq8yxbym688fxb"; + sha256 = "1xr11dm94qpbx3nxb7si7zy7hzg2akj01pyxkd8pzzbvmkmic16j"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index f5c8f64633bb..6abddbbdbe50 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ boost zlib libevent openssl python bison flex ] - ++ stdenv.lib.optional (!static) twisted; + nativeBuildInputs = [ cmake pkgconfig bison flex ]; + buildInputs = [ boost zlib libevent openssl ] + ++ stdenv.lib.optionals (!static) [ python twisted ]; preConfigure = "export PY_PREFIX=$out"; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index fc2176aac258..771753fdbb9c 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.16.55"; # N.B: if you change this, change botocore too + version = "1.16.56"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "sha256-tQUhRANOSQNYxlnQ5IDBek5gT9Ou6al93+bjYaJFpKU="; + sha256 = "sha256-RxUe1XHDFkWPSTHNJCKZW6DJ9oGMXffXX0n8hFII5C4="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 3c351ca24573..831a546014b5 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.19.55"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.19.56"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-s0Mn2Es7tWIPtUYDZ3qalzsWcpDCweeracSkayAcbUY="; + sha256 = "sha256-AUluTCwGqreWifLDRaDizOtf4dp4WKfn3xibz5dwMiM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index d3465110194e..692c021a64ff 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -4,13 +4,13 @@ let py = python; in buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.22"; + version = "8.0.23"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "084q8x86ywgxgpsgdid8y9rjjys06146dqinfpmlggjswbq9kl0d"; + sha256 = "sha256-YVtcHbDsW1mTjbCY1YhqgtqWv4keKlLExn2AhlOzNEw="; }; propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ]; diff --git a/pkgs/development/r-modules/wrapper.nix b/pkgs/development/r-modules/wrapper.nix index 76e819501a57..12704149666c 100644 --- a/pkgs/development/r-modules/wrapper.nix +++ b/pkgs/development/r-modules/wrapper.nix @@ -1,21 +1,31 @@ -{ runCommand, R, makeWrapper, recommendedPackages, packages }: - -runCommand (R.name + "-wrapper") { +{ symlinkJoin, R, makeWrapper, recommendedPackages, packages }: +symlinkJoin { + name = R.name + "-wrapper"; preferLocalBuild = true; allowSubstitutes = false; buildInputs = [R] ++ recommendedPackages ++ packages; + paths = [ R ]; nativeBuildInputs = [makeWrapper]; + postBuild = '' + cd ${R}/bin + for exe in *; do + rm "$out/bin/$exe" + + makeWrapper "${R}/bin/$exe" "$out/bin/$exe" \ + --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" + done + ''; + # Make the list of recommended R packages accessible to other packages such as rpy2 passthru = { inherit recommendedPackages; }; + + meta = R.meta // { + # To prevent builds on hydra + hydraPlatforms = []; + # prefer wrapper over the package + priority = (R.meta.priority or 0) - 1; + }; } -'' -mkdir -p $out/bin -cd ${R}/bin -for exe in *; do - makeWrapper ${R}/bin/$exe $out/bin/$exe \ - --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" -done -'' diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 786ed360ef33..e38645e84c5c 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.38"; + version = "8.39"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1j4k75iv32fsp40ajdfm99zady5c0h0f39xvmv70frp8p58kq3rl"; + sha256 = "sha256-CPPSJVKf01TA89Qk/uyvIU+ejo5JyT4Mc35KKJPv4IE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index fc37324bc925..f9bd749f0147 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.4.0"; + version = "2.4.1"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "1mplya2dyqqmm6gj4if2k4h2fra15rxf2yfnhphqhz40kz75sxk8"; + sha256 = "sha256-UHH+nV62jHvEY6T5UKz5cm9zse9pWHPAjjsGHfpPoPY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 80731a2106e4..0eb895034359 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.141.0"; + version = "0.142.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1hbq55gi834zapmly0gmg3kpqa1zwxcw4gll4g6vgzr0pfa0bwb2"; + sha256 = "sha256-peK9+3RsY+4LuN+N/w+HIFX18yDZfqEuioBezNq7yXw="; }; installPhase = '' diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix index 315b74b820e5..71e5a54320a7 100644 --- a/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, coreutils }: stdenv.mkDerivation { - version = "4.0.3"; + version = "4.0.4"; pname = "redo-sh"; src = fetchurl { url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz"; - sha256 = "1n84ld4fihqa7a6kn3f177dknz89qcvissfwz1m21bwdq950avia"; + sha256 = "0d3hz3vy5qmjr9r4f8a5cx9hikpzs8h8f0fsl3dpbialf4wck24g"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/dapper/default.nix b/pkgs/development/tools/dapper/default.nix index 664dd61246d6..c49870346cbf 100644 --- a/pkgs/development/tools/dapper/default.nix +++ b/pkgs/development/tools/dapper/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { pname = "dapper"; - version = "0.5.3"; + version = "0.5.4"; goPackagePath = "github.com/rancher/dapper"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "rancher"; repo = "dapper"; rev = "v${version}"; - sha256 = "1h62jahrxpmqx6r3mlakzap8gisrymgkp5syyarpab05qm1inngd"; + sha256 = "sha256-2KyDFiCxqoQt/m12vyHH8/L88+dOQGGsnI3l1G82NxQ="; }; patchPhase = '' substituteInPlace main.go --replace 0.0.0 ${version} diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 1a0fdf403082..f881f5c610db 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -25,11 +25,11 @@ buildPythonApplication rec { pname = "devpi-client"; - version = "5.2.0"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1y8r1pjav0gyrbnyqjnc202sa962n1gasi8233xj7jc39lv3iq40"; + sha256 = "74ff365efeaa7b78c9eb7f6d7bd349ccd6252a6cdf879bcb4137ee5ff0fb127a"; }; buildInputs = [ glibcLocales pkginfo check-manifest ]; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 2b4bf66a0158..609df797b585 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.54.0"; + version = "1.54.1"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "163n3d07vv9d4356ql6hbw2vg6n5c834axz7y4gk8gm9badbna82"; + sha256 = "sha256-f8jD+kFW4Y7Sfi1p4TOtW3Lwsf6cqCEDjj+XL4A3eh0="; }; meta = with lib; { diff --git a/pkgs/development/tools/errcheck/default.nix b/pkgs/development/tools/errcheck/default.nix index 3c42c1437a47..eb9589f723da 100644 --- a/pkgs/development/tools/errcheck/default.nix +++ b/pkgs/development/tools/errcheck/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "errcheck"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "kisielk"; repo = "errcheck"; rev = "v${version}"; - sha256 = "00skyvy31yliw0f395j5h3gichi5n2q1m24izjidxvyc2av7pjn6"; + sha256 = "sha256-ZmocFXtg+Thdup+RqDYC/Td3+m1nS0FydZecfsWXIzI="; }; - vendorSha256 = "0mx506qb5sy6p4zqjs1n0w7dg8pz2wf982qi9v7nrhxysl2rlnxf"; + vendorSha256 = "sha256-rluaBdW+w2zPThELlBwX/6LXDgc2aIk/ucbrsrABpVc="; meta = with lib; { description = "Program for checking for unchecked errors in go programs"; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 4235912c24f0..6ff123bb2be3 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "kustomize"; - version = "3.9.1"; - # rev is the 3.8.7 commit, mainly for kustomize version command output - rev = "7439f1809e5ccd4677ed52be7f98f2ad75122a93"; + version = "3.9.2"; + # rev is the 3.9.2 commit, mainly for kustomize version command output + rev = "e98eada7365fc564c9aba392e954f306a9cbf1dd"; buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in '' @@ -17,13 +17,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "1v8yfiwzg84bpdh3k3h5v2smxx0dymq717r2mh3pjz3nifkg3ilm"; + sha256 = "0p1rxswfaj0g3y8nfw70qmxrlyv1pnzkapy1mxpzzyf04mmhg7wn"; }; # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "1nixkmyqzq7387rwam0bsa6qjd40k5p15npq0iz1z2k1ws8pvrg6"; + vendorSha256 = "1pv8g0nnrpzbvd6dqgnrw2i27xkilbrr9npdz6pxr7mmbcg3w3w9"; meta = with lib; { description = "Customization of kubernetes YAML configurations"; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index ef04e78da609..726b3ddfcf7c 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.11540"; + version = "0.1.11756"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "QtD+H59AlXp+3mXtUA44Dl+3xEvWdO8FybuBnL9sjBA="; + sha256 = "sha256-qFlT40jIfJ/J80LTa+OsSkWCSguqDAS1cXjuYUT0AbU="; }; - vendorSha256 = "fIk443TD4W0hhNuvFSZiV+fdxjelNsxh1+3qtw9yiZY="; + vendorSha256 = "sha256-6FBMLwoLM2BtnMHQfpY7f7NiQt5evsL4CfYTZvr3gAs="; doCheck = false; diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 68140904aadf..9abb6407d401 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "2021.01.03-00.42.23"; + version = "2021.01.16-03.28.20"; src = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar"; - sha256 = "06h69hwm3kl1nr94l43j91pnvkzgnacsg6a6cly4abrg041qhbv3"; + sha256 = "sha256-dURdgx+uY2zcXwhyhxPYxvUXGMsd25E+4eulYq/jOYo="; }; dontUnpack = true; diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 29d8dfdead54..f2c8d72ec18c 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "1ccwa44hpmpd57ff6w02rvrs63wxwmgls2i1rn285rxypmbysrp0"; + sha256 = "sha256-qoN9pTpmXfwaJ37MqAggiPsH4cPr+nsT6NhAUOVclSw="; }; - cargoSha256 = "1sffivpgrn4my57pcrg46b2yg6fmhxj61d2sqvg60fjljrg595zn"; + cargoSha256 = "sha256-mmd9Ds37ST+OuCt506/YbdpOOJBp7WIVZBq+bQ2SR3U="; nativeBuildInputs = [ perl pkg-config ]; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 0e0769f35de5..619997c01ddb 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -10,10 +10,10 @@ }: let - version = "1.15.1"; + version = "1.16"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "1hrp2rfwl06ff2b2i12ccka58l1brvn6xqgm1f38k36s61mbs1py"; + sha256 = "sha256-lKeeBbRJjQRgq3vZ0Sy/BRVuOke/DF0UIM7h1Ek7ODI="; }; in stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "0ijar1cycj42p39cgpnwdwr6nz5pyr6vacr1gvc0f6k92pl8vr13"; + sha256 = "sha256-koQY59VrfE28h2qt0TiPGypBLQTvvT0hoOrVIEznIP4="; }; # postPatch: diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 73bb7a28874f..ae34596fc71b 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -389,6 +389,18 @@ let extractNuGet = callPackage ./python/extract-nuget.nix { }; }; + msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "debugger-for-chrome"; + publisher = "msjsdiag"; + version = "4.12.11"; + sha256 = "sha256-9i3TgCFThnFF5ccwzS4ATj5c2Xoe/4tDFGv75jJxeQ4="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + naumovs.color-highlight = buildVscodeMarketplaceExtension { mktplcRef = { name = "color-highlight"; diff --git a/pkgs/misc/vscode-extensions/update_installed_exts.sh b/pkgs/misc/vscode-extensions/update_installed_exts.sh index fdbc14fb2642..659ed8da791e 100755 --- a/pkgs/misc/vscode-extensions/update_installed_exts.sh +++ b/pkgs/misc/vscode-extensions/update_installed_exts.sh @@ -8,7 +8,7 @@ function fail() { exit 1 } -# Helper to clean up after ourself if we're killed by SIGINT +# Helper to clean up after ourselves if we're killed by SIGINT. function clean_up() { TDIR="${TMPDIR:-/tmp}" echo "Script killed, cleaning up tmpdirs: $TDIR/vscode_exts_*" >&2 @@ -18,7 +18,7 @@ function clean_up() { function get_vsixpkg() { N="$1.$2" - # Create a tempdir for the extension download + # Create a tempdir for the extension download. EXTTMP=$(mktemp -d -t vscode_exts_XXXXXXXX) URL="https://$1.gallery.vsassets.io/_apis/public/gallery/publisher/$1/extension/$2/latest/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage" @@ -32,7 +32,7 @@ function get_vsixpkg() { # Clean up. rm -Rf "$EXTTMP" - # I don't like 'rm -Rf' lurking in my scripts but this seems appropriate + # I don't like 'rm -Rf' lurking in my scripts but this seems appropriate. cat <<-EOF { @@ -44,7 +44,7 @@ function get_vsixpkg() { EOF } -# See if can find our code binary somewhere. +# See if we can find our `code` binary somewhere. if [ $# -ne 0 ]; then CODE=$1 else diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 83d01bbb6b62..629d2c9a0866 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,27 +1,27 @@ { "4.14": { "extra": ".a", - "name": "linux-hardened-4.14.215.a.patch", - "sha256": "1bk00y0cm05pzsshf1kmbxwcizi0lnq6ss1ig2bhxzgv2rxzj8cz", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.215.a/linux-hardened-4.14.215.a.patch" + "name": "linux-hardened-4.14.216.a.patch", + "sha256": "1pv0akd1dmhm10r9b7xambn3ipl1niypsmb3ibfmxdj4zln0g7aq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.216.a/linux-hardened-4.14.216.a.patch" }, "4.19": { "extra": ".a", - "name": "linux-hardened-4.19.167.a.patch", - "sha256": "1ijdlkh1ad803i9dds46w2457jwigzlil9v37x793v4mx0rqb8ag", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.167.a/linux-hardened-4.19.167.a.patch" + "name": "linux-hardened-4.19.168.a.patch", + "sha256": "09s9l5qf44ly41fjs745gh00vf0lkkzymcks44zyzmsznjsxm2xx", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.168.a/linux-hardened-4.19.168.a.patch" }, "5.10": { "extra": ".a", - "name": "linux-hardened-5.10.7.a.patch", - "sha256": "1b5djibfdqs0zhidh87hz9fhnvxyjxnz7lys0ks3a9a7ha5mina4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.7.a/linux-hardened-5.10.7.a.patch" + "name": "linux-hardened-5.10.8.a.patch", + "sha256": "1nqn50c6g7j7ljdq7y50y6kgmilc5mb266lg6z6kz0cqpn2qaxxx", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.8.a/linux-hardened-5.10.8.a.patch" }, "5.4": { "extra": ".a", - "name": "linux-hardened-5.4.89.a.patch", - "sha256": "1rbk8j8f31j8jjb7p29q3sv538jjlrc9mgxrac4pga11dmxzgahk", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.89.a/linux-hardened-5.4.89.a.patch" + "name": "linux-hardened-5.4.90.a.patch", + "sha256": "1x0fkcgsw7q99xa2f97i2cyybwj4kjf6vypbm2bwgl76ghpchydq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.90.a/linux-hardened-5.4.90.a.patch" }, "5.9": { "extra": "", diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index d914ef63ead1..c8b90b69d372 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.215"; + version = "4.14.216"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1ni6p485dszi365rfflrwmjl6arbkhfvl1zm7p99vcv11hllx14s"; + sha256 = "19dvxmqvs1ysl127zqdcqq2pyf7370jj66fd73zdx6ya2pplz1mp"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index f432b38f9c8a..8ed7ed65b151 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.167"; + version = "4.19.168"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "00gddgr1jj9zkd10mbbkanfkgpqi2jqszibq80rc9bbmgiknfb1i"; + sha256 = "1whkqklqj8rz9lv88aldvwkwnb9xvg0njdbcrk56r7z6f9zkhnmm"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index ae832fe58aaf..1e3b353650a1 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.251"; + version = "4.4.252"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "13mnlwwcwvbyqn8lafjymq66qjfj7nksdiyrcgymx8s03z1why86"; + sha256 = "0lchvfvn0kvqh1yixwscz4wrzd965zsxjkpc7nqiw9rhmvma3paf"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index fea6a7c7102a..5e67d55dab00 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.251"; + version = "4.9.252"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03cn3yzyv8vwvv76nxj655i14s9avhr4hcc18mq2rh0qn6zcnkgg"; + sha256 = "1shllgrmxi6darnyzwkzazzjhpwxhm19z1swv40hnm0pbvgxm7hw"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index a9519bedecc8..5c4afea3a8e0 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.7"; + version = "5.10.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1gpsdxq2gx40gpmm0zya0wxd7fdflbaq9j1j0hbffahgz44nxgsc"; + sha256 = "1v83wm8xbhq1sgn7c84zi7l40vmd9k1gb653b686jp8n4na85z2w"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index fec3e314b825..e17a56a93570 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.89"; + version = "5.4.90"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1bqamd3z71h8jh3mxfisqiaxj5m027xjyifj9ryqdwbdgcbxb396"; + sha256 = "06pscvxjkpz35y6kbmyzdvn9mm4p7pfg0d49chi1q61z0sy3crv4"; }; } // (args.argsOverride or {})) diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index 02c19e22e748..3aa7b074848e 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dgraph"; - version = "20.07.2"; + version = "20.07.3"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "0cx2qqn8b7v0qvhrwzjqghymm8r2a0v86pyfgqxmmyfghjhykax4"; + sha256 = "sha256-yuKXcxewt64T0ToDPid37WUEhwLu+yt4tjhDQobj/Ls="; }; - vendorSha256 = "111lixpqp8p2q4kg9342220i00dcp2lwp2j3hasdvwdrrf0971by"; + vendorSha256 = "sha256-2Ub0qdEaVSHHE5K0bNSXJFukGeSSXNpIBoUldF8jGpI="; doCheck = false; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index c6cf5a5ad825..b0dc7a227576 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.22.6"; + version = "0.22.11"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "1kd7kqiic6mm974cix7m3620yzdaxpdnnq4q53pyicfq2i4pk2ml"; + sha256 = "sha256-lOsPB1e3jUBbNZfVHlnNBCMo8mZFpGNhkvGU8+Rq+Kk="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "0hyp44gzmp49mv26xa9j2nc64y2v3np1x1iqc4vsryf3ajsy2720"; + vendorSha256 = "sha256-+qfgEiJbFtG1/a6RNnYsJzU1ZPYenvhdWh+wIEISRrI="; doCheck = false; diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 6417064663a1..c8722fbe8f75 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,25 +2,19 @@ stdenv.mkDerivation rec { pname = "wallabag"; - version = "2.3.8"; + version = "2.4.0"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - sha256 = "1sr62hfk2f2rl5by48dg8yd1gchngjnc850as17wr3w287p1kwsq"; + sha256 = "11vda7aqq82kpr88v4hr7zg19zfq970n3z4qp25my8b1fvlgdjhi"; }; outputs = [ "out" ]; patches = [ ./wallabag-data.patch # exposes $WALLABAG_DATA - (fetchurl { - # Fixes "Uncaught RuntimeException: Setting "piwik_enabled" couldn't be found."; https://github.com/wallabag/wallabag/issues/3662 - # Remove >= 2.4.0 - url = "https://github.com/wallabag/wallabag/pull/3868.patch"; - sha256 = "0pfxsv8ncaxkjkybim3v3iswmfv1vbjlzmvj50nn9blvjwc9gxjg"; - }) ]; dontBuild = true; diff --git a/pkgs/servers/web-apps/wallabag/wallabag-data.patch b/pkgs/servers/web-apps/wallabag/wallabag-data.patch index 086e93959800..f70ffce29052 100644 --- a/pkgs/servers/web-apps/wallabag/wallabag-data.patch +++ b/pkgs/servers/web-apps/wallabag/wallabag-data.patch @@ -1,9 +1,9 @@ diff --git a/app/AppKernel.php b/app/AppKernel.php -index 40726f05..7d44e600 100644 +index 347197e..902b558 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php -@@ -58,14 +58,19 @@ class AppKernel extends Kernel - return $bundles; +@@ -69,19 +69,24 @@ class AppKernel extends Kernel + return __DIR__; } + public function getProjectDir() @@ -24,3 +24,9 @@ index 40726f05..7d44e600 100644 } public function registerContainerConfiguration(LoaderInterface $loader) + { +- $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml'); ++ $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml'); + + $loader->load(function ($container) { + if ($container->getParameter('use_webpack_dev_server')) { diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 11796bee94b6..683c58d8406f 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-01-14"; + version = "2021-01-16"; pname = "oh-my-zsh"; - rev = "a3bdff694a388c9bede63afec3c4a0a78bffa1ba"; + rev = "efcbd9f3480a28ec69c607c46adcbfd8d230ac9f"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "03zw150d11hmkdy39pazprmpsgg2jqvif2kdysg86p43ah40x8w9"; + sha256 = "1zngxqkhm49m2qczvyp5mws7d4bwxbb3fq20xqbbdpgk35smwnxc"; }; installPhase = '' diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 8a258f613478..4fda82839a8b 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.215"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.216"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-1gKpZAWYWnniX2wOFtTaQbYWSaDDSE+y4RNIWHpDSks="; + sha256 = "sha256-6kJ+PmFVHf8rGvp7X7t7e1+RVoRL/OEQHP9gqSHughY="; }; postPatch = '' diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 96520f10ffaf..449630400cef 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.22.0"; + version = "1.22.2"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "1hxr5w8cd6f967cvhgqd3pvl8dlx2hb0pvjslzzbrs65djf8zh3k"; + sha256 = "sha256-HzKRZJcWgNPOQYx6JXmx8vomtOuWaaBfMzwxOqXjHI4="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 08f61da03076..12e8845e011a 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,178 +1,178 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "2.17.0"; + version = "2.17.2"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.17.0-linux-x64.tar.gz"; - sha256 = "0k2vdgyb75krjqb9kikkfpvd6rn90gm6dzbpgzsycrwrmbx3rk79"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.17.2-linux-x64.tar.gz"; + sha256 = "0hz4m0h9k1ma8zig5mhmianvrw0bwsv9qsz7q80bsjj7m1vy59jq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.1-linux-amd64.tar.gz"; - sha256 = "0qghccr8kj21scsil4ibc19y3sgrsyzs5c04a5ppv1k62y89h7m7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-linux-amd64.tar.gz"; + sha256 = "1jrv87r55m1kzl48zs5vh83v2kh011gm4dha80ijqjhryx0a94jy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.23.0-linux-amd64.tar.gz"; sha256 = "125jqdjn9iipnjj3xgwvcfhcq0xi8xvn8mgs17g79xwbbxpvrjiv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.0-linux-amd64.tar.gz"; - sha256 = "14pdsvgd512qflvkc1890q9wrri2rrcjdjw5n9lf2qb2m7wvns4y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-linux-amd64.tar.gz"; + sha256 = "18gyan0dszfvx8fhvi8r2msbf8n9lbh10pnvcaqvdk8cr79lnzl9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.2-linux-amd64.tar.gz"; - sha256 = "0xq36wh57w7b7l5skx173lj3chl4rfgbfdivsvyjlnfahh2fmfr4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.3-linux-amd64.tar.gz"; + sha256 = "064003d7frnj16njp7pdgbvq42hv7xwwbrnnxm3pk85h1xkpa1x8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.14.0-linux-amd64.tar.gz"; - sha256 = "0vj9674msiadnhmcypqv3dvhkl60sms9frjzpf4hnhlimxc9fpdd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.14.1-linux-amd64.tar.gz"; + sha256 = "0cpvxqm6bv2085ndn4b39v53s2050rhbnk3g0d6a2s32b70m4hay"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.2.0-linux-amd64.tar.gz"; - sha256 = "1qipbpp74690w7n42dfsp8524gdjvm8z5665rmsy7mbdi2bd2x5v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.2.1-linux-amd64.tar.gz"; + sha256 = "0ish124033nagqrb60kc0ybwkmijfq2y7x4kdcrxhkhn2n5wzqzh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.0-linux-amd64.tar.gz"; - sha256 = "0khbcgqbssndx8fwb34ny0wcpy3xi165lq8dq224q1f9bjbklbml"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.1-linux-amd64.tar.gz"; + sha256 = "1582h37z0971pd7xp6ss7r7742068pkbh2k5q8jj6ii3d7rwbbp1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.6.1-linux-amd64.tar.gz"; - sha256 = "13x9yxfyx65pqgsnpdfi12z6fg3b50fzkmsffvwi80857z2389rg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.7.0-linux-amd64.tar.gz"; + sha256 = "0a9xz13h905r8m9h3v7zl04sjyic031zra9bsz3n3lr3x8ihhz6z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.4.1-linux-amd64.tar.gz"; - sha256 = "1s8g32d06dfaayjhga3skdh7vsrv5ysmhz6ygg202pqqpiy27vl5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.4.2-linux-amd64.tar.gz"; + sha256 = "0i7mbvf5azxxlxj0b3divqxvsq3q1346d4bbwx983zbn66j13iml"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.4.0-linux-amd64.tar.gz"; - sha256 = "0diylv5kbxjhwvwmwil6l8ln9lijmjnxwgf4yd0rhad118zpibnp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.4.1-linux-amd64.tar.gz"; + sha256 = "01m6gpyrvirr1b447g47zrnwf03z3x7msyhd0waf4knm22d9ym0l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.1-linux-amd64.tar.gz"; - sha256 = "1851nx4mmgc2j4jihcqxlx5c5dx95xbc2h0kxr055zvdfg2wcp8i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.5.1-linux-amd64.tar.gz"; + sha256 = "0fi8qxv6ladpapb6j0w7zqk0hxj56iy1131dsipzkkx4p1jfg27r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.5-linux-amd64.tar.gz"; - sha256 = "0f90v8q00hhqrnmwa17gl9sas61bzqsgblpaw1p48agnjxa76vnz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.6-linux-amd64.tar.gz"; + sha256 = "1w1ygmh8w1cyfc1cca9zpfix2bakdlhms4clp5xcwrlr9hc33w5d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.1-linux-amd64.tar.gz"; - sha256 = "0zrza0i73ld16szbbsz3h9p9z09ws2pf380kzb1358g70ayvzga3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-linux-amd64.tar.gz"; + sha256 = "1c39fk37kx093n0ldk8szblgcx0hviyyd7mxzp7nb97s4rvmf48l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.2-linux-amd64.tar.gz"; - sha256 = "12gs049074vn5s0njza0r48bk5z8d7bfc50j2mbbylkdrlrl87ci"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.3-linux-amd64.tar.gz"; + sha256 = "0c2aypx8y6s892y2gygc8116rlarlcw1s2m39gkcdjjbfkmf8za0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.10.1-linux-amd64.tar.gz"; - sha256 = "16mq1ymvkql3l6f3rsinm4yfxfl9qcpwfmhc8k1vj79h6gkd29cz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.10.2-linux-amd64.tar.gz"; + sha256 = "0hhj4y96c9nwbvzpaq7ilyal0s3vsf2ks0y6pqbiyh6ji0ch6xlb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz"; sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.2-linux-amd64.tar.gz"; - sha256 = "1xxhc5sy3z391dgzzb4s6wzad2n2j3f5g158wffcj8jss2ylbh1x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.3-linux-amd64.tar.gz"; + sha256 = "1rh14rngpcbqly5i3cgwfgi90drkg6fa0gkgpfa7f9mkm4wpgla8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.0-linux-amd64.tar.gz"; - sha256 = "1q8ifm8xmny04y38bswclaa065x657sjq9b573fxrnv9gv9nx5sy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.1-linux-amd64.tar.gz"; + sha256 = "0jpv94kzsa794ds5bjj6j3pj1wxqicavpxjnycfa5cm8w71kmlsh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.2.0-linux-amd64.tar.gz"; - sha256 = "047izxnmsykmk3dpm2q4zxhi575hiqlb1l7xx6sy43dh6ink16jb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.2.1-linux-amd64.tar.gz"; + sha256 = "0saavajpnn5rx70n7rzfymrx8v17jf99n1zz20zgrhww67s3p2l6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.3-linux-amd64.tar.gz"; - sha256 = "1g32kjvh7zp6f4n4qy457s45qf9ddrzyd5ncfdvpsd0dirjf4crg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-linux-amd64.tar.gz"; + sha256 = "0lyvpfmjsjxpwq1b74j2jipp36n7zczlxgy0pr6j7c027d26sym6"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.17.0-darwin-x64.tar.gz"; - sha256 = "0pa1a4j977cn3m43zia75aj4g5bqr69n0a4hha72dbnnid4d72g8"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.17.2-darwin-x64.tar.gz"; + sha256 = "1a9gy1767aizajkgl0qds9q4fkapyf9xip0hz67sj6861w6r6p6i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.1-darwin-amd64.tar.gz"; - sha256 = "1q3r1a3wqzaw78abiz97364a9qgr3rr1m83kyjni3jhs5cgxbax0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-darwin-amd64.tar.gz"; + sha256 = "1rqx2dyx3anmlv74whs587rs1bgyssqxfjzrx1cfpfnnnj5rkmry"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.23.0-darwin-amd64.tar.gz"; sha256 = "0h4g49zr6gxvyavd9pzvlmnzxjqnnzh27dhz6007c10rgn894yba"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.0-darwin-amd64.tar.gz"; - sha256 = "0k1azgpkrqbr4482h5v2w5qnavmgl5vnx0my2wsgzkwg5pv2i1ky"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-darwin-amd64.tar.gz"; + sha256 = "0dqyd8aywmxrsvipndwrwq5pxv7avzf8kpk6rdyip4j8hp156lbz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.2-darwin-amd64.tar.gz"; - sha256 = "09z1kn5gbgda0d4sfyd17qv1p9ldvxn8jbd049s46gvalmqbfwpd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.3-darwin-amd64.tar.gz"; + sha256 = "18q6f3qlw7yk6ri1mq6fvl69ss7rxnivzv2aag8rxds06xrl6klq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.14.0-darwin-amd64.tar.gz"; - sha256 = "08clh3nnb32gzvnghk5w9m04jh3nn3svy4qx0hfidj3ci0dz6ncl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.14.1-darwin-amd64.tar.gz"; + sha256 = "0jbz0d551347vp1b4chjkv03rq9l7061ijwyi2mx0spx7q847zs4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "01z8hwlw5i19rpcjk03iw12q2j9xy5in60d6y70v2n4nsmpqhlmq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.2.1-darwin-amd64.tar.gz"; + sha256 = "0blrl421zwn7ga0skr49lqc1c1z98qy03p2ivyjygwz2pppdv9p9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.0-darwin-amd64.tar.gz"; - sha256 = "04d3gn89kn7q494g7j6wz3ivmqkdk12l0i2lsmwqlmn3jra44wnd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.1-darwin-amd64.tar.gz"; + sha256 = "06q9pysql611p24padz6cz2fhf14bqkw7li504479sbnsxqk3g0s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.6.1-darwin-amd64.tar.gz"; - sha256 = "1jxxm8iq1cnym45c8g2js731xz1xwgg72gfxryvy8i7faq6cxakq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.7.0-darwin-amd64.tar.gz"; + sha256 = "1ys5s3asmwwsy3hv4mrcdsqyc579wqaihlhdc6bqvnyfn5wbbwk8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.4.1-darwin-amd64.tar.gz"; - sha256 = "17pyiknkjnqlh3cyvclbzg60qf8qig4rp4b0d97vhx8njb5ia9z5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.4.2-darwin-amd64.tar.gz"; + sha256 = "1azgic0mgzqmdcq61is2fny9q9w2aslrpbp2zsclc60prqsi47nd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.4.0-darwin-amd64.tar.gz"; - sha256 = "01vpfn62gnklamn2s17icdvzl25d9d97g0mdz955vwqhjsx7man3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.4.1-darwin-amd64.tar.gz"; + sha256 = "0nziryb7d66l0pca77g7w6z92jsfhvqgi53bw5hkkr2ca1k9mkxl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.1-darwin-amd64.tar.gz"; - sha256 = "0552wdbykypaafyacjfwqc4sfsl87pgayrnkwg1km00mb1dknzl9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.5.1-darwin-amd64.tar.gz"; + sha256 = "05h8adn3q7nnhn75vircrnr9nxf15pf82n9gvz5rbq0hsdivh3l2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.5-darwin-amd64.tar.gz"; - sha256 = "0lhvv5d2v21b0sqcy6wabjlqwg9qx9gxbysnkx3c5f5iwk1hrj8g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.6-darwin-amd64.tar.gz"; + sha256 = "15dvr92v490i7b415x80rxyjp2r0hp51xwha87yjpxp1knwfbbg4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.1-darwin-amd64.tar.gz"; - sha256 = "1382c66vfkzr4hinqi45g7w9s7zv8yhj4in5wnd20s3cg5890mr1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-darwin-amd64.tar.gz"; + sha256 = "19v60l2djvigf60zacchfr98kfb8wxk1rmhdswyhhhz41jh30qhl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.2-darwin-amd64.tar.gz"; - sha256 = "1fb6p0nafs3s0kablwyq8v5kf5bs0fi9hkgwkz8hl0ydijzpasl4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.3-darwin-amd64.tar.gz"; + sha256 = "15w72087frbx6wyngi20bsssnr7si1bk1h94jav3d4cgm6nhpnwk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.10.1-darwin-amd64.tar.gz"; - sha256 = "0s6iaqn1jfm7glfnmdps6rk4iqrq2xspmbn4dmqj6q9w9ig1wab6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.10.2-darwin-amd64.tar.gz"; + sha256 = "0x6rjn3kg935chcwd90qj1knlrc5xz5any7s4sc3a8fh2n78f0vd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz"; sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.2-darwin-amd64.tar.gz"; - sha256 = "0mf7a33ldvfx3yiprprh0cdb4bcnjcp7dhl0bifwyi644v94ffm1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.3-darwin-amd64.tar.gz"; + sha256 = "033262l7yylw9y8ifrag2fsdpfvqjmmrxmmhksvysjmz9slb60kg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.0-darwin-amd64.tar.gz"; - sha256 = "192a9zkc0yz44jzx3b7xcfy1xdw2blfsmqqvy7dqjhg029nfjfzp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.1-darwin-amd64.tar.gz"; + sha256 = "0d578hqkhwlhx50k9qpw7ixjyy1p2fd6cywj86s870jzgl8zh4fv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "1x5avdbfsrxs98lz20vyl1vyz2dnkz6cdix3yqm4nnyllin34pps"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.2.1-darwin-amd64.tar.gz"; + sha256 = "12nfk2pc380gnkblrviwyijr9ff5h1xv2ybv6frdczfd1kdjf9ar"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.3-darwin-amd64.tar.gz"; - sha256 = "1hzcy1mxvcv9nm5jf6dy96ha3f29kcnbidfw01qc4smy8hc40f66"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-darwin-amd64.tar.gz"; + sha256 = "11c1d1jw0z4ybwvqfvmjcx3gkpwnvi5vcq01bc7a2wg374mkhj62"; } ]; }; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 1dd05fe1c901..1cc62745cc4a 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -3,32 +3,32 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="2.17.0" +VERSION="2.17.2" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( - "auth0=1.5.1" + "auth0=1.5.2" "aws=3.23.0" - "cloudflare=2.11.0" - "consul=2.6.2" - "datadog=2.14.0" - "digitalocean=3.2.0" - "docker=2.6.0" - "gcp=4.6.1" - "github=2.4.1" - "gitlab=3.4.0" - "hcloud=0.4.1" - "kubernetes=2.7.5" - "mailgun=2.3.1" - "mysql=2.3.2" - "openstack=2.10.1" + "cloudflare=2.11.1" + "consul=2.6.3" + "datadog=2.14.1" + "digitalocean=3.2.1" + "docker=2.6.1" + "gcp=4.7.0" + "github=2.4.2" + "gitlab=3.4.1" + "hcloud=0.5.1" + "kubernetes=2.7.6" + "mailgun=2.3.2" + "mysql=2.3.3" + "openstack=2.10.2" "packet=3.2.2" - "postgresql=2.5.2" - "random=3.0.0" - "vault=3.2.0" - "vsphere=2.11.3" - ); + "postgresql=2.5.3" + "random=3.0.1" + "vault=3.2.1" + "vsphere=2.11.4" +) function genMainSrc() { local url="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-$1-x64.tar.gz" diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index 95e4d83645e0..61ea43d3dbd0 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-cross"; - version = "2020-06-29"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = version; - sha256 = "0mnccmhlqmpdx92v495z39i07hbvjwdr5n4zbarlrr1d7rm99lx4"; + sha256 = "03agx9f7klw96isfdz3xsw47308qxmgs24nsz7j9kx3f337fn435"; }; nativeBuildInputs = [ cmake python3 ]; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool designed for parsing and converting SPIR-V to other shader languages"; homepage = "https://github.com/KhronosGroup/SPIRV-Cross"; + changelog = "https://github.com/KhronosGroup/SPIRV-Cross/releases/tag/${version}"; platforms = platforms.linux; license = licenses.asl20; maintainers = with maintainers; [ Flakebi ]; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 6fab09aaeafe..15a2a643d32d 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.9"; + version = "1.8.10"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "07jsakihci98ww1hgppilq942raz05c5xi2pzq632vq5i11fi0nj"; + sha256 = "sha256-S1bnzuOZGQLdVJUH+A29KxF84dj2OeLJ4XajfTDdjUY="; }; - vendorSha256 = "0adva7crl6dachbf76920aniki3zcq9chdjjrzssasm89zqgwicf"; + vendorSha256 = "sha256-X1h0EcUf8MWt929huNjt0WnhFqhVZu07JGi7c5hdXoY="; doCheck = false; diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index a2f3938adec1..7379c666e377 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.10.5"; + version = "2.10.9"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "0imf9ngmyhyj5jdr99g1xc3vqzr61fnz32bxhmy63n1szylig5zq"; + sha256 = "sha256-Dx6yVgmi0CTKpBKQ5US+UpiI0d1S4vPZSbRWmmnHIMk="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1czc0jma5k6idv463kn5qrirq8apgfrcxwv2yjk0pxy6vkji6154"; + cargoSha256 = "sha256-OFmDllEQKeByzra/XttQzdlBlahHvKsZM1ShsmV1OcM="; doCheck = false; diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index d8c828c22287..c40753dcf99a 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "1rcbxqcxr8v5faa52psjsjjlnkia5cwc3b1cwka9f5cxwhdwg7hr"; + sha256 = "sha256-JwGa1icwV1yqxy90Psd9bzM7VzM7HPA6kONkI3Y745Q="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1q15xy15hk6r3sai9wry2jm57dhinx6r84yxg9fwvq354613k645"; + cargoSha256 = "sha256-DVcjczH7i+R2xs9pEaek4zHYHO90G7fVF7yFUPCWLmU="; doCheck = false; diff --git a/pkgs/tools/misc/haste-client/Gemfile b/pkgs/tools/misc/haste-client/Gemfile new file mode 100644 index 000000000000..851fabc21ddb --- /dev/null +++ b/pkgs/tools/misc/haste-client/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gemspec diff --git a/pkgs/tools/misc/haste-client/Gemfile.lock b/pkgs/tools/misc/haste-client/Gemfile.lock new file mode 100644 index 000000000000..430407946604 --- /dev/null +++ b/pkgs/tools/misc/haste-client/Gemfile.lock @@ -0,0 +1,38 @@ +PATH + remote: . + specs: + haste (0.2.3) + faraday (~> 0.9) + json + +GEM + remote: https://rubygems.org/ + specs: + diff-lcs (1.4.4) + faraday (0.17.3) + multipart-post (>= 1.2, < 3) + json (2.3.1) + multipart-post (2.1.1) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.3) + +PLATFORMS + ruby + +DEPENDENCIES + haste! + rspec + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/tools/misc/haste-client/default.nix b/pkgs/tools/misc/haste-client/default.nix new file mode 100644 index 000000000000..477ba5820aa3 --- /dev/null +++ b/pkgs/tools/misc/haste-client/default.nix @@ -0,0 +1,31 @@ +{ lib +, bundlerEnv +, buildRubyGem +, ruby +}: + +let + version = "0.2.3"; + deps = bundlerEnv rec { + name = "haste-client-${version}"; + inherit ruby; + gemdir = ./.; + }; +in +buildRubyGem rec { + name = "haste-client-${version}"; + inherit version; + gemName = "haste"; + + source.sha256 = "0jaq0kvlxwvd0jq9pl707saqnaaal3dis13mqwfjbj121gr4hq4q"; + + propagatedBuildInputs = [ deps ]; + + meta = with lib; { + description = "Command line interface to the AnyStyle Parser and Finder"; + homepage = "https://rubygems.org/gems/haste"; + license = licenses.mit; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/haste-client/gemset.nix b/pkgs/tools/misc/haste-client/gemset.nix new file mode 100644 index 000000000000..336df25081bd --- /dev/null +++ b/pkgs/tools/misc/haste-client/gemset.nix @@ -0,0 +1,703 @@ +{ + diff-lcs = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz"; + type = "gem"; + }; + version = "1.4.4"; + }; + faraday = { + dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13aghksmni2sl15y7wfpx6k5l3lfd8j9gdyqi6cbw6jgc7bqyyn2"; + type = "gem"; + }; + version = "0.17.3"; + }; + haste = { + dependencies = ["faraday" "json"]; + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + path = ./.; + type = "path"; + }; + version = "0.2.3"; + }; + json = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; + type = "gem"; + }; + version = "2.3.1"; + }; + multipart-post = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "maglev"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.8"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "1.9"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.0"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.1"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.2"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.3"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.4"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.5"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "maglev"; + version = "2.6"; + } { + engine = "rbx"; + } { + engine = "rbx"; + } { + engine = "rbx"; + version = "1.8"; + } { + engine = "rbx"; + version = "1.9"; + } { + engine = "rbx"; + version = "2.0"; + } { + engine = "rbx"; + version = "2.1"; + } { + engine = "rbx"; + version = "2.2"; + } { + engine = "rbx"; + version = "2.3"; + } { + engine = "rbx"; + version = "2.4"; + } { + engine = "rbx"; + version = "2.5"; + } { + engine = "rbx"; + version = "2.6"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.8"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "1.9"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.0"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.1"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.2"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.3"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.4"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.5"; + } { + engine = "ruby"; + version = "2.6"; + } { + engine = "ruby"; + version = "2.6"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + type = "gem"; + }; + version = "2.1.1"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h"; + type = "gem"; + }; + version = "3.9.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xndkv5cz763wh30x7hdqw6k7zs8xfh0f86amra9agwn44pcqs0y"; + type = "gem"; + }; + version = "3.9.2"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bxkv25qmy39jqrdx35bfgw00g24qkssail9jlljm7hywbqvr9bb"; + type = "gem"; + }; + version = "3.9.2"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr"; + type = "gem"; + }; + version = "3.9.1"; + }; + rspec-support = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dandh2fy1dfkjk8jf9v4azbbma6968bhh06hddv0yqqm8108jir"; + type = "gem"; + }; + version = "3.9.3"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/i3nator/default.nix b/pkgs/tools/misc/i3nator/default.nix new file mode 100644 index 000000000000..a6d78d3c4c92 --- /dev/null +++ b/pkgs/tools/misc/i3nator/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "i3nator"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "pitkley"; + repo = pname; + rev = version; + sha256 = "10rxvxq48dhzlw5p9fsj6x0ci4pap85s9b192zakgvk4h97ifp2p"; + }; + + cargoSha256 = "1i58ix414klm72562scqhb0lmy4wgpiksriz5qs4ss7lzvqdsizy"; + + meta = with lib; { + description = "Tmuxinator for the i3 window manager"; + homepage = "https://github.com/pitkley/i3nator"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ mpoquet ]; + }; +} diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 2044aeb35543..590fcf1dbafe 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.3.0"; + version = "1.3.5"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "1y0im2xs6pibbfri2k7g9jqbzm90jd9a5lghrzasxmkzjfcimrnf"; + sha256 = "sha256-yTkUGsVwK6nwHUQpYhkPYF/Cf4URrr5ThB67sxq7Ecs="; }; - vendorSha256 = "0lljm594xgcv7ylz7qn170r9526k9d1lh77m9f9zcnhdd2qw4rw1"; + vendorSha256 = "sha256-J7VGYxX1bH5CeDhpqK9mIbHUekXslImZ+O3wN5Q7kYk="; doCheck = false; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 115f2f321609..92493ab109f4 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.6.6"; + version = "8.6.7"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "0bd7q3j2i0r3v4liv2xpqlvx4nrixpdhr1yy1c579bls7y4myv61"; + sha256 = "sha256-+Hsxu/gqMKRWBJT7JqOw8Ck+5fQG0D3wSJBb9fgkPsw="; }; - vendorSha256 = "06hqb5r9p67zh0v5whdsb3rvax6461y2n6jkhjwmn6zzswpgkg7y"; + vendorSha256 = "sha256-ULXC8lVu/TTSzYJ4EpAQvDwntRV0+Vmr8VPaEe54qdA="; doCheck = false; diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix index 978b82c77fb7..3526562e11c8 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "dnscrypt-proxy2"; - version = "2.0.44"; + version = "2.0.45"; vendorSha256 = null; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "08bg60j5z349blj5sip1f8f793q12ix3zmqkayym5nf69s1pfm7l"; + sha256 = "sha256-BvCxrFMRWPVVjK2sDlVbJKC/YK/bi4lBquIsdwOFXkw="; }; meta = with lib; { diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 3c51073570fb..a04244642ba5 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.33.3"; + version = "0.33.8"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "0c7hqsb53711032svicr069gh7faacnsj2v36pj7srng266vk78p"; + sha256 = "sha256-4QbIcg4C7TQJ1k+PQN0jwtZiXmcO8D609YkNLVyzW8w="; }; vendorSha256 = null; diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 761e9eb4619b..f40161840294 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "0g0kw1b18kk9jhvw88hcxc04ccj8k22fdzky7l2dv3r37vndd91w"; + sha256 = "sha256-sGco8ISbm3C8w6FsF5oq7G09WBBTO9cVeoFnuKauMWQ="; }; - cargoSha256 = "0cmp4w86qnzd2b2w4s3w019857pxysgikkl1g7ldkiylrsm5vlpn"; + cargoSha256 = "sha256-X7us7mLtOSST5LazxSkej9D2ezEk9GiWdudqy4peSJ8="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 0822828eb90b..08a83f8c9b2d 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "doppler"; - version = "3.19.0"; + version = "3.21.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "049x8y7zjvpd1gvkrld69dffnf4pawjwm7by71r6z408hwvfqjpa"; + sha256 = "sha256-ll4PabDy5xnyi+cZdjvSySizRCxthRY7uHLzdYP6U5M="; }; - vendorSha256 = "1s8zwjfk9kcddn8cywr7llh9v5m140kvmi5lmy2glvwh3rwccgxf"; + vendorSha256 = "sha256-rQrlnIYYnRc+cqyiyJoh1YqxD61doyjte7ehrX4RDTI="; buildFlagsArray = "-ldflags=-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}"; diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index cdb156f3121a..a70eb45b0677 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cri-tools"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "0dx21ws4nzzizzjb0g172fzvjgwck88ikr5c2av08ii06rys1567"; + sha256 = "sha256-fU3g0m2drUsa2Jyz+QYXi4xWTOLINGsDw3dKcesAkkE="; }; vendorSha256 = null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb049d9923db..ebf981208e05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2652,6 +2652,8 @@ in rmapi = callPackage ../applications/misc/remarkable/rmapi { }; + rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { }; + remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { }; ryujinx = callPackage ../misc/emulators/ryujinx { }; @@ -4915,6 +4917,8 @@ in hasmail = callPackage ../applications/networking/mailreaders/hasmail { }; + haste-client = callPackage ../tools/misc/haste-client { }; + hal-flash = callPackage ../os-specific/linux/hal-flash { }; hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; @@ -22575,6 +22579,8 @@ in i3minator = callPackage ../tools/misc/i3minator { }; + i3nator = callPackage ../tools/misc/i3nator { }; + i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { }; i3status = callPackage ../applications/window-managers/i3/status.nix { };