diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-12 00:02:14 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-12 00:02:14 +0000 |
commit | 33248a2cafb255edb4c91a290864194242622de3 (patch) | |
tree | 13114ade9e94e05d17dc1c77935efa08dab925d2 /pkgs/development/compilers | |
parent | 9776723357705dedeb933221c8f9b295d44813d7 (diff) | |
parent | 647a6f42eef18d2e8367f1870dfa718640b8a63a (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/cairo/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/gnu-smalltalk/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/kotlin/native.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/sdcc/default.nix | 47 |
4 files changed, 6 insertions, 53 deletions
diff --git a/pkgs/development/compilers/cairo/default.nix b/pkgs/development/compilers/cairo/default.nix index 31eda13e26b07..daf086e587b8f 100644 --- a/pkgs/development/compilers/cairo/default.nix +++ b/pkgs/development/compilers/cairo/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cairo"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "starkware-libs"; repo = "cairo"; rev = "v${version}"; - hash = "sha256-X8CqiikY1/S8/WxrZbcwOB+bz0PJsNpuLWLb+k3+5kw="; + hash = "sha256-5UOLfsNgtg5EDDId23ysmWfeqMeh8R2UfMeBAtFCx6s="; }; - cargoHash = "sha256-jrUH3vmTbbxod547JAE5sOSo+FR15XNgVpM15uXAsvg="; + cargoHash = "sha256-YoPStyPeEqLoUvGLEPwXR8XVhXtb6XwFuPNoDCiT7OA="; nativeCheckInputs = [ rustfmt diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index e608a25462ccc..834a30b371696 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -55,6 +55,6 @@ in stdenv.mkDerivation rec { homepage = "http://smalltalk.gnu.org/"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; - maintainers = with maintainers; [ skeidel ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index 4f6dddb3fa13f..b50f6287c971f 100644 --- a/pkgs/development/compilers/kotlin/native.nix +++ b/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.9.10"; + version = "1.9.20"; src = let getArch = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { getHash = arch: { "macos-aarch64" = "1pn371hy6hkyji4vkfiw3zw30wy0yyfhkxnkkyr8m0609945mkyj"; "macos-x86_64" = "13c28czvja93zaff0kzqf8crzh998l90gznq0cl6k2j3c0jhyrgm"; - "linux-x86_64" = "0nxaiwn4akfpkibq42y8kfn5hdd7vzkm296qx4a9ai7l36cngcqx"; + "linux-x86_64" = "sha256-faMuBYUG5qj0N4vg5EcfWIC3UjXiPhFJuikzXVgNsjw="; }.${arch}; in fetchurl { diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix deleted file mode 100644 index 5e5a0bee51fce..0000000000000 --- a/pkgs/development/compilers/sdcc/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, zlib, gputils ? null -, excludePorts ? [] }: - -let - # choices: mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8 - excludedPorts = excludePorts ++ (lib.optionals (gputils == null) [ "pic14" "pic16" ]); -in - -stdenv.mkDerivation rec { - pname = "sdcc"; - version = "4.2.0"; - - src = fetchurl { - url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; - sha256 = "sha256-tJuuHSO81gV6gsT/5WE/nNDLz9HpQOnYTEv+nfCowFM="; - }; - - enableParallelBuilding = true; - - buildInputs = [ boost gputils texinfo zlib ]; - - nativeBuildInputs = [ autoconf bison flex ]; - - configureFlags = map (f: "--disable-${f}-port") excludedPorts; - - preConfigure = '' - if test -n "''${dontStrip-}"; then - export STRIP=none - fi - ''; - - meta = with lib; { - description = "Small Device C Compiler"; - longDescription = '' - SDCC is a retargettable, optimizing ANSI - C compiler suite that targets - the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim - (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) HC08 based - (hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000, - Rabbit 3000A). Work is in progress on supporting the Microchip PIC16 and - PIC18 targets. It can be retargeted for other microprocessors. - ''; - homepage = "https://sdcc.sourceforge.net/"; - license = with licenses; if (gputils == null) then gpl2Plus else unfreeRedistributable; - maintainers = with maintainers; [ bjornfor yorickvp ]; - platforms = platforms.all; - }; -} |