cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #168435 from AndersonTorres/new-muon

Browse source 
Small rewrites
This commit is contained in:
Anderson Torres 2022-04-14 02:15:45 -03:00 committed by GitHub
commit ce932dbcf1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
pkgs/development/compilers/muon/default.nix → pkgs/development/compilers/muonlang/default.nix
View file

30
pkgs/development/tools/build-managers/samurai/default.nix
View file

@ -1,4 +1,8 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch }:
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "samurai";
@ -8,17 +12,21 @@ stdenv.mkDerivation rec {
owner = "michaelforney";
repo = pname;
rev = version;
sha256 = "sha256-RPY3MFlnSDBZ5LOkdWnMiR/CZIBdqIFo9uLU+SAKPBI=";
hash = "sha256-RPY3MFlnSDBZ5LOkdWnMiR/CZIBdqIFo9uLU+SAKPBI=";
};
makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ];
patches = [
# NULL pointer dereference in writefile() in util.c; remove this at the next
# release
(fetchpatch {
name = "CVE-2021-30218.patch";
url = "https://github.com/michaelforney/samurai/commit/e84b6d99c85043fa1ba54851ee500540ec206918.patch";
sha256 = "sha256-hyndwj6st4rwOJ35Iu0qL12dR5E6CBvsulvR27PYKMw=";
})
# NULL pointer dereference in printstatus() in build.c; remove this at the
# next release
(fetchpatch {
name = "CVE-2021-30219.patch";
url = "https://github.com/michaelforney/samurai/commit/d2af3bc375e2a77139c3a28d6128c60cd8d08655.patch";
@ -27,10 +35,24 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
description = "ninja-compatible build tool written in C";
homepage = "https://github.com/michaelforney/samurai";
description = "ninja-compatible build tool written in C";
longDescription = ''
samurai is a ninja-compatible build tool with a focus on simplicity,
speed, and portability.
It is written in C99, requires various POSIX.1-2008 interfaces, and
nowadays implements ninja build language through version 1.9.0 except for
Microsoft (R) Visual C++ (TM) dependency handling (deps = msvc).
It is feature-complete (but not bug-compatible) and supports most of the
same options as ninja, using the same format for .ninja_log and
.ninja_deps as the original ninja tool, currently version 5 and 4
respectively.
'';
license = with licenses; [ mit asl20 ]; # see LICENSE
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ dtzWill AndersonTorres ];
platforms = platforms.all;
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -13113,7 +13113,7 @@ with pkgs;
mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { };
muon = callPackage ../development/compilers/muon { };
muonlang = callPackage ../development/compilers/muonlang { };
inherit (callPackages ../development/compilers/nim { })
nim-unwrapped nimble-unwrapped nim;