From 86e1452556e811619b0762fdaa9e3006453fe07d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 26 Aug 2019 12:11:52 -0300
Subject:  theme-obsidian2: 2.8 -> 2.9  (#67501)

* theme-obsidian2: 2.8 -> 2.9

* theme-obsidian2: move to pkgs/data

* theme-obsidian2: use pname

* theme-obsidian2: run hooks preInstall and postInstall in install phase
---
 pkgs/misc/themes/obsidian2/default.nix | 32 --------------------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 pkgs/misc/themes/obsidian2/default.nix

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/misc/themes/obsidian2/default.nix
deleted file mode 100644
index 8a8e88ff6f96..000000000000
--- a/pkgs/misc/themes/obsidian2/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
-
-stdenv.mkDerivation rec {
-  name = "theme-obsidian2-${version}";
-  version = "2.8";
-
-  src = fetchFromGitHub {
-    owner = "madmaxms";
-    repo = "theme-obsidian-2";
-    rev = "v${version}";
-    sha256 = "0qryqpyxbhr0kyar2cshwhzv4da6rfz9gi4wjb6xvcb6szxhlcaq";
-  };
-
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
-  postPatch = ''
-    sed -i -e 's|Obsidian-2-Local|Obsidian-2|' Obsidian-2/index.theme
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share/themes
-    cp -a Obsidian-2 $out/share/themes
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Gnome theme, based upon Adwaita-Maia dark skin";
-    homepage = https://github.com/madmaxms/theme-obsidian-2;
-    license = with licenses; [ gpl3 ];
-    platforms = platforms.linux;
-    maintainers = [ maintainers.romildo ];
-  };
-}
-- 
cgit v1.2.3


From 4b60e0d6bcae4d98b4dbedf9dbfa5a68c4854473 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 26 Aug 2019 18:47:28 -0400
Subject: vscode-extensions.ms-vscode.cpptools: 0.24.1 -> 0.25.0

---
 pkgs/misc/vscode-extensions/cpptools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index a5dad88b924e..73b533f368ef 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -83,8 +83,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "cpptools";
     publisher = "ms-vscode";
-    version = "0.24.1";
-    sha256 = "0gqplcppfg2lr6k198q9pw08n0cpc0wvc9w350m9ivv35hw0x5ra";
+    version = "0.25.0";
+    sha256 = "0vqqc0j9ahhb9a8wrhjjb34rfdj7msqsza3443bi4206gkiwpp3n";
   };
 
   buildInputs = [
-- 
cgit v1.2.3