Merge master into staging-next

3 files changed, 3 insertions, 54 deletions

diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
index e7d9287e0d50e..a40065fe579c9 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gleam";
-  version = "0.10.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "gleam-lang";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0cgs0halxhp2hh3sf0nvy5ybllhraxircxxbfj9jbs3446dzflbk";
+    sha256 = "1g8yfp1xpkv1lqz8azam40cvrs5cggxlyrb72h8k88br75qmi6hj";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ] ++
     stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "12lpxighjk3ydfa288llj6xqas7z9fbfjpwnl870189awvp2fjxx";
+  cargoSha256 = "1gfr6c4i5kx8x3q23s4b4n25z2k6xkxpk12acr4ry97pyj2lr5wq";
 
   meta = with stdenv.lib; {
     description = "A statically typed language for the Erlang VM";
diff --git a/pkgs/development/compilers/kcc/default.nix b/pkgs/development/compilers/kcc/default.nix
deleted file mode 100644
index 49851dd0c074a..0000000000000
--- a/pkgs/development/compilers/kcc/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, bison, flex, boost }:
-
-stdenv.mkDerivation rec {
-  pname = "kcc";
-
-  version = "4.0.0";
-
-  src = fetchFromGitHub {
-    owner = "KnightOS";
-    repo = "kcc";
-    rev = version;
-    sha256 = "1cd226nqbxq32mppkljavq1kb74jqfqns9r7fskszr42hbygynk4";
-  };
-
-  nativeBuildInputs = [ cmake bison flex ];
-
-  buildInputs = [ boost ];
-
-  meta = with stdenv.lib; {
-    homepage    = "https://knightos.org/";
-    description = "KnightOS C compiler";
-    license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ siraben ];
-  };
-}
diff --git a/pkgs/development/compilers/scas/default.nix b/pkgs/development/compilers/scas/default.nix
deleted file mode 100644
index e80724c8a4ccc..0000000000000
--- a/pkgs/development/compilers/scas/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ fetchFromGitHub, stdenv, cmake }:
-
-
-stdenv.mkDerivation rec {
-  pname = "scas";
-  
-  version = "0.4.6";
-  
-  src = fetchFromGitHub {
-    owner = "KnightOS";
-    repo = "scas";
-    rev = version;
-    sha256 = "1c6s9nivbwgv0f8n7j73h54ydgqw5dcpq8l752dfrnqg3kv3nn0h";
-  };
-  
-  nativeBuildInputs = [ cmake ];
-  
-  hardeningDisable = [ "format" ];
-  
-  meta = with stdenv.lib; {
-    homepage    = "https://knightos.org/";
-    description = "Assembler and linker for the Z80.";
-    license     = licenses.mit;
-    maintainers = with maintainers; [ siraben ];
-  };
-}