From ff8b896bf26051ef2dcbabaf3d1285f22e7653f4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 13:27:24 +0000 Subject: [PATCH 01/15] peco: 0.5.8 -> 0.5.10 --- pkgs/tools/text/peco/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix index 2928d5322072..36951be7edbc 100644 --- a/pkgs/tools/text/peco/default.nix +++ b/pkgs/tools/text/peco/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "peco"; - version = "0.5.8"; + version = "0.5.10"; subPackages = [ "cmd/peco" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "peco"; repo = "peco"; rev = "v${version}"; - sha256 = "12xbqisk7bcy38fmjxcs069a0600gncbqzscqw6x37lgw6hlw52x"; + sha256 = "sha256-Iu2MclUbUYX1FuMnE65Qdk0S+5+K3HW86WIdQrNUyY8="; }; - vendorSha256 = "1p8pc50ql2vqnn0crx0y558i3m0d6vcdaj3995h3f0908pnk6x7q"; + vendorSha256 = "sha256-+HQz7UUgATdgSWlI1dg2DdQRUSke9MyAtXgLikFhF90="; meta = with lib; { description = "Simplistic interactive filtering tool"; From acc9fd541590bfa06e3df5e731a31325ee7085a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 14:03:04 +0000 Subject: [PATCH 02/15] pioneer: 20210203 -> 20210723 --- pkgs/games/pioneer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index 51eda72bdefc..8e6d458dbb2c 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "pioneer"; - version = "20210203"; + version = "20210723"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - sha256 = "sha256-51HXbX15uB1Xf9Re7Qi41BnJ9OW+GeXQhylJ+HwP0f8="; + sha256 = "sha256-w+ECVv96MoS69815+X0PqguDiGDhHoTnAnnYtLpMScI="; }; nativeBuildInputs = [ cmake pkg-config ]; From cbb53a5f66eda1a4e7f6c43c8c670b845fc2ab65 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 19:45:26 +0000 Subject: [PATCH 03/15] richgo: 0.3.6 -> 0.3.9 --- pkgs/development/tools/richgo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix index f36c84c1ee09..4e11b5a64d84 100644 --- a/pkgs/development/tools/richgo/default.nix +++ b/pkgs/development/tools/richgo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "richgo"; - version = "0.3.6"; + version = "0.3.9"; src = fetchFromGitHub { owner = "kyoh86"; repo = "richgo"; rev = "v${version}"; - sha256 = "sha256-ehhrJlB0XzLHkspvP6vL8MtrjE12baBFkbqWMD41/Sg="; + sha256 = "sha256-yVt0iFH9tYCeIWJC16ve988xBXgt96357YiHfsxai7g="; }; - vendorSha256 = "sha256-986Abeeb1MHB/0yN1oud6t8wHD5B5MisRHKZcwOq4tU="; + vendorSha256 = "sha256-IJjJ4X3mv2PUmwzt5/hgv1N6R0w+EXGSrCS4q+INJrA="; doCheck = false; From 3e4fd842e638b147cfef4659aaed39a27e8bde5c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 21:01:21 +0000 Subject: [PATCH 04/15] vsftpd: 3.0.3 -> 3.0.5 --- pkgs/servers/ftp/vsftpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index d78c7ca18d19..3aad0460b3fe 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "vsftpd"; - version = "3.0.3"; + version = "3.0.5"; src = fetchurl { url = "https://security.appspot.com/downloads/vsftpd-${version}.tar.gz"; - sha256 = "1xsyjn68k3fgm2incpb3lz2nikffl9by2safp994i272wvv2nkcx"; + sha256 = "sha256-JrYCrkVLC6bZnvRKCba54N+n9nIoEGc23x8njHC8kdM="; }; buildInputs = [ libcap openssl pam ]; From 2caeaca5ff369bc53d133b40eb3aad87b8a35d79 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Aug 2021 12:48:52 +0000 Subject: [PATCH 05/15] crawl: 0.27.0 -> 0.27.1 --- pkgs/games/crawl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 6595f1ee0dc5..02e34e5f749d 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "sha256-TTdzFWoWn9OfxosEsxUjmDtPmtHukpT0J/0y4kUvBvo="; + sha256 = "sha256-fyI7OIzhYXNTjIgJLqApyPMmiG3iof1b5XuGudNanos="; }; # Patch hard-coded paths and remove force library builds From 4b8c664c7e87fd2a8beabff7b6772e40405cd658 Mon Sep 17 00:00:00 2001 From: Timothy Date: Tue, 31 Aug 2021 02:23:16 +0700 Subject: [PATCH 06/15] bazel_4: 4.1.0 -> 4.2.1 --- .../tools/build-managers/bazel/bazel_4/default.nix | 6 +++--- .../tools/build-managers/bazel/bazel_4/src-deps.json | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 6cd378492e32..47e01c5ad807 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -27,12 +27,12 @@ }: let - version = "4.1.0"; + version = "4.2.1"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1svf9n345m0ag05hlcw3cwsl6bw2imcn4da25yyzcl3ar5axfxzk"; + sha256 = "Eup6oR4r2xLeHc65k5oi6W9aSAQ3yxfBIzedjg/fXoI="; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -56,7 +56,7 @@ let else srcs."java_tools_javac11_linux-v10.6.zip") srcs."coverage_output_generator-v2.5.zip" srcs.build_bazel_rules_nodejs - srcs."android_tools_pkg-0.19.0rc3.tar.gz" + srcs."android_tools_pkg-0.23.0.tar.gz" srcs.bazel_toolchains srcs.com_github_grpc_grpc srcs.upb diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json index 3027183aef39..4496343ec691 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json @@ -62,14 +62,14 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", - "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" + "sha256": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz" }, - "android_tools_pkg-0.19.0rc3.tar.gz": { - "name": "android_tools_pkg-0.19.0rc3.tar.gz", - "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", + "android_tools_pkg-0.23.0.tar.gz": { + "name": "android_tools_pkg-0.23.0.tar.gz", + "sha256": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e", "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz" ] }, "b1c40e1de81913a3c40e5948f78719c28152486d.zip": { From 9dc6c77734b76a46cd2608a4e819d44e2c37f885 Mon Sep 17 00:00:00 2001 From: ImGabe Date: Fri, 3 Sep 2021 09:14:20 -0300 Subject: [PATCH 07/15] maintainers: add imgabe --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0bcaf2e4367b..2ebde6c16c04 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4621,6 +4621,12 @@ githubId = 993484; name = "Greg Hale"; }; + imgabe = { + email = "gabrielpmonte@hotmail.com"; + github = "imgabe"; + githubId = 24387926; + name = "Gabriel Pereira"; + }; imlonghao = { email = "nixos@esd.cc"; github = "imlonghao"; From b7679ce2f90b960c88181d3d1ec8351367d6c94f Mon Sep 17 00:00:00 2001 From: ImGabe Date: Fri, 3 Sep 2021 09:16:15 -0300 Subject: [PATCH 08/15] vscode-extensions.arcticicestudio.nord-visual-studio-code: init at 0.18.0 --- pkgs/misc/vscode-extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 84dc60093d60..9eb2e9905d6a 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -129,6 +129,23 @@ let }; }; + arcticicestudio.nord-visual-studio-code = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "nord-visual-studio-code"; + publisher = "arcticicestudio"; + version = "0.18.0"; + sha256 = "sha256-Uo6peR+2ZNX6nwJ0Yar32Pe0rfBZ+f6ef1cYhUvVUbE="; + }; + meta = with lib; { + description = "An arctic, north-bluish clean and elegant Visual Studio Code theme."; + downloadPage = + "https://marketplace.visualstudio.com/items?itemName=arcticicestudio.nord-visual-studio-code"; + homepage = "https://github.com/arcticicestudio/nord-visual-studio-code"; + license = licenses.mit; + maintainers = with maintainers; [ imgabe ]; + }; + }; + arrterian.nix-env-selector = buildVscodeMarketplaceExtension { mktplcRef = { name = "nix-env-selector"; From 5f88ab504431ba042cfd03f8a80a9e6497c6fb06 Mon Sep 17 00:00:00 2001 From: Romanos Skiadas Date: Wed, 8 Sep 2021 15:16:27 +0300 Subject: [PATCH 09/15] mopidy-iris: 3.58.0 -> 3.58.2 --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 131b2c680b9b..c4e231ad4099 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.58.0"; + version = "3.58.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1bsmc4p7b6v4mm8fi9zsy0knzdccnz1dc6ckrdr18kw2ji0hiyx2"; + sha256 = "1cni9dd1c97bp92crjhsbwml12z8i6wkmj79zz8qvk46k8ixy3vp"; }; propagatedBuildInputs = [ From 4598ff3bb844d34125da38e1ea3138ca461449c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dav=C3=AD=C3=B0=20Steinn=20Geirsson?= Date: Tue, 7 Sep 2021 15:55:01 +0000 Subject: [PATCH 10/15] nixos/libinput: Add transformation matrix option --- nixos/modules/services/x11/hardware/libinput.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index 439708bc47ed..e2fb7d0918e3 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -163,6 +163,15 @@ let cfg = config.services.xserver.libinput; ''; }; + transformationMatrix = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + A string of 9 space-separated floating point numbers. Sets the transformation matrix to + the 3x3 matrix where the first row is (abc), the second row is (def) and the third row is (ghi). + ''; + }; + disableWhileTyping = mkOption { type = types.bool; default = false; @@ -196,6 +205,7 @@ let cfg = config.services.xserver.libinput; ${optionalString (cfg.${deviceType}.accelSpeed != null) ''Option "AccelSpeed" "${cfg.${deviceType}.accelSpeed}"''} ${optionalString (cfg.${deviceType}.buttonMapping != null) ''Option "ButtonMapping" "${cfg.${deviceType}.buttonMapping}"''} ${optionalString (cfg.${deviceType}.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.${deviceType}.calibrationMatrix}"''} + ${optionalString (cfg.${deviceType}.transformationMatrix != null) ''Option "TransformationMatrix" "${cfg.${deviceType}.transformationMatrix}"''} ${optionalString (cfg.${deviceType}.clickMethod != null) ''Option "ClickMethod" "${cfg.${deviceType}.clickMethod}"''} Option "LeftHanded" "${xorgBool cfg.${deviceType}.leftHanded}" Option "MiddleEmulation" "${xorgBool cfg.${deviceType}.middleEmulation}" @@ -227,6 +237,7 @@ in { "sendEventsMode" "tapping" "tappingDragLock" + "transformationMatrix" "disableWhileTyping" "additionalOptions" ]); From d4726d156e22afb397df4ad374d513b4c956fecb Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Tue, 8 Jun 2021 01:01:42 +1000 Subject: [PATCH 11/15] clapper: init at 0.4 --- pkgs/applications/video/clapper/default.nix | 85 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/applications/video/clapper/default.nix diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix new file mode 100644 index 000000000000..96358383047a --- /dev/null +++ b/pkgs/applications/video/clapper/default.nix @@ -0,0 +1,85 @@ +{ config +, lib +, stdenv +, fetchFromGitHub +, glib +, gobject-introspection +, python3 +, pkg-config +, ninja +, wayland +, wayland-protocols +, desktop-file-utils +, makeWrapper +, shared-mime-info +, wrapGAppsHook +, meson +, gjs +, gtk4 +, gst_all_1 +, libadwaita +}: + +stdenv.mkDerivation rec { + pname = "clapper"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "Rafostar"; + repo = pname; + rev = version; + sha256 = "1gf4z9lib5rxi1xilkxxyywakm9zlq5915w2wib09jyh0if82ahr"; + }; + + nativeBuildInputs = [ + desktop-file-utils # for update-desktop-database + glib + gobject-introspection + meson + ninja + makeWrapper + pkg-config + python3 + shared-mime-info # for update-mime-database + wrapGAppsHook # for gsettings + ]; + + buildInputs = [ + gjs + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gtk4 + libadwaita + wayland + wayland-protocols + ]; + + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + mesonFlags = [ + # TODO: https://github.com/NixOS/nixpkgs/issues/36468 + "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" + ]; + + postInstall = '' + cp ${src}/data/icons/*.svg $out/share/icons/hicolor/scalable/apps/ + cp ${src}/data/icons/*.svg $out/share/icons/hicolor/symbolic/apps/ + ''; + + meta = with lib; { + description = "A GNOME media player built using GJS with GTK4 toolkit and powered by GStreamer with OpenGL rendering. "; + longDescription = '' + Clapper is a GNOME media player build using GJS with GTK4 toolkit. + The media player is using GStreamer as a media backend and renders everything via OpenGL. + ''; + homepage = "https://github.com/Rafostar/clapper"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ tomfitzhenry ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89756d2669c1..8a410f89781b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23922,6 +23922,8 @@ with pkgs; cipher = callPackage ../applications/misc/cipher { }; + clapper = callPackage ../applications/video/clapper { }; + claws-mail-gtk2 = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; useGtk3 = false; From 65b30d36be591cf8d7cd4c9e11f63a9bcfa85440 Mon Sep 17 00:00:00 2001 From: Andrey Petrov Date: Tue, 14 Sep 2021 17:24:34 -0400 Subject: [PATCH 12/15] mycrypto: 1.7.16 -> 1.7.17 --- pkgs/applications/blockchains/mycrypto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/applications/blockchains/mycrypto/default.nix index d8867da5fd56..f5dbfeb5ff9b 100644 --- a/pkgs/applications/blockchains/mycrypto/default.nix +++ b/pkgs/applications/blockchains/mycrypto/default.nix @@ -4,13 +4,13 @@ let pname = "MyCrypto"; - version = "1.7.16"; - hash = "sha256-fvV/dT9tj8/d/kjM0dVj3IC/O7Y/yG8fscDCzUBwHKI="; + version = "1.7.17"; + sha256 = "20eb48989b5ae5e60e438eff6830ac79a0d89ac26dff058097260e747e866444"; # Taken from release's checksums.txt.gpg name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/mycryptohq/mycrypto/releases/download/${version}/linux-x86-64_${version}_MyCrypto.AppImage"; - inherit hash; + inherit sha256; }; appimageContents = appimageTools.extractType2 { From 75ab200ca4de1b9b50afb523badc466c77fccbfb Mon Sep 17 00:00:00 2001 From: Eduard Bopp Date: Wed, 15 Sep 2021 11:35:29 +0200 Subject: [PATCH 13/15] oneshot: 1.5.0 -> 1.5.1 --- pkgs/tools/networking/oneshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/oneshot/default.nix b/pkgs/tools/networking/oneshot/default.nix index 2e809eb2d1bd..9c0f4469982b 100644 --- a/pkgs/tools/networking/oneshot/default.nix +++ b/pkgs/tools/networking/oneshot/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oneshot"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "raphaelreyna"; repo = "oneshot"; rev = "v${version}"; - sha256 = "sha256-LxLMETZzoeu7qEHpUFmo/h+7sdly+R5ZWsNhyttcbpA="; + sha256 = "sha256-5NCGKgmioTOHGJEWMIEsZlA+072XXL9L8KbEH6+caHc="; }; vendorSha256 = "sha256-rL/NWIIggvngTrdTDm1g1uH3vC55JF3cWllPc6Yb5jc="; From 86f62ec915b2934bcf67ec527604148c6fb060ab Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Wed, 15 Sep 2021 14:08:57 -0500 Subject: [PATCH 14/15] indilib: 1.9.1 -> 1.9.2 --- .../libraries/science/astronomy/indilib/default.nix | 4 ++-- .../libraries/science/astronomy/indilib/indi-3rdparty.nix | 3 ++- .../libraries/science/astronomy/indilib/indi-full.nix | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index eb0f34db26f5..0ab4c8cd6ca6 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "indilib"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - sha256 = "sha256-qXGTHyXhJrApexQL31fba0ZvnHEyTsY3Tb7aB4GpGn4="; + sha256 = "sha256-5MaN1aNyHpZzKwQPUpp9NYRh7i+lx1N70+J1gczdtAE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 5909a06cfb59..c4faadd2a5eb 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { postPatch = '' for f in indi-qsi/CMakeLists.txt \ indi-dsi/CMakeLists.txt \ - indi-armadillo-platypus/CMakeLists.txt + indi-armadillo-platypus/CMakeLists.txt \ + indi-orion-ssg3/CMakeLists.txt do substituteInPlace $f \ --replace "/lib/udev/rules.d" "lib/udev/rules.d" \ diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix index 4ac9a122fd2f..5cdd4c4b2b26 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix @@ -1,12 +1,12 @@ { stdenv, lib, callPackage, fetchFromGitHub, indilib }: let - indi-version = "1.9.1"; + indi-version = "1.9.2"; indi-3rdparty-src = fetchFromGitHub { owner = "indilib"; repo = "indi-3rdparty"; rev = "v${indi-version}"; - sha256 = "sha256-F0O4WUYdUL6IjJyON/XJp78v4n5rj0unm1xTzEsEH0k="; + sha256 = "sha256-dpuJ/J5gc+kAklbvMjsWic9jusXWB4gUcT8E/1eSLXQ="; }; indi-firmware = callPackage ./indi-firmware.nix { version = indi-version; From 97bbfa3da434f205d02aa66ce335451a55b81f44 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Fri, 17 Sep 2021 08:36:09 +0800 Subject: [PATCH 15/15] vscode-extensions.antfu.slidev: init at 0.3.2 --- pkgs/misc/vscode-extensions/default.nix | 30 ++++++++++++++++++------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index ba634b8238ab..a2039629d246 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -117,15 +117,29 @@ let }; }; - antfu.icons-carbon = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "icons-carbon"; - publisher = "antfu"; - version = "0.2.2"; - sha256 = "0mfap16la09mn0jhvy8s3dainrmjz64vra7d0d4fbcpgg420kv3f"; + antfu = { + icons-carbon = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "icons-carbon"; + publisher = "antfu"; + version = "0.2.2"; + sha256 = "0mfap16la09mn0jhvy8s3dainrmjz64vra7d0d4fbcpgg420kv3f"; + }; + meta = with lib; { + license = licenses.mit; + }; }; - meta = with lib; { - license = licenses.mit; + + slidev = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "antfu"; + name = "slidev"; + version = "0.3.2"; + sha256 = "sha256-vzmByEiKZIkd707Bs4RGQrMII5sghYlkQI6aAJOHFcY="; + }; + meta = with lib; { + license = licenses.mit; + }; }; };