diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix new file mode 100644 index 00000000000..b300a190e1c --- /dev/null +++ b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, fetchurl +, ncurses5 +, python27 +}: + +stdenv.mkDerivation rec { + pname = "gcc-arm-embedded"; + version = "10-2020-q4-major"; + subdir = "10-2020q4"; + + suffix = { + aarch64-linux = "aarch64-linux"; + x86_64-darwin = "mac"; + x86_64-linux = "x86_64-linux"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + sha256 = { + aarch64-linux = "0spkbh7vnda1w0nvavk342nb24nqxn8kln3k9j85mzil560qqg9l"; + x86_64-darwin = "1h5xn0npwkilqxg7ifrymsl7kjpafr9r9gjqgcpb0kjxavijvldy"; + x86_64-linux = "066nvhg5zdf3jvy9w23y439ghf1hvbicdyrrw9957gwb8ym4q4r1"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + + installPhase = '' + mkdir -p $out + cp -r * $out + ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man + ''; + + preFixup = '' + find $out -type f | while read f; do + patchelf "$f" > /dev/null 2>&1 || continue + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + done + ''; + + meta = with stdenv.lib; { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; + homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; + license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index f635fce972f..7d8a4b5b14d 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; installPhase = '' mkdir -p $out @@ -30,12 +33,9 @@ stdenv.mkDerivation rec { ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; - dontPatchELF = true; - dontStrip = true; - preFixup = '' find $out -type f | while read f; do - patchelf $f > /dev/null 2>&1 || continue + patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true done diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 4944038fde4..633ae054d05 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; installPhase = '' mkdir -p $out @@ -30,12 +33,9 @@ stdenv.mkDerivation rec { ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; - dontPatchELF = true; - dontStrip = true; - preFixup = '' find $out -type f | while read f; do - patchelf $f > /dev/null 2>&1 || continue + patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true done diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index 510889dad62..99ec9d1b549 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; installPhase = '' mkdir -p $out @@ -30,12 +33,9 @@ stdenv.mkDerivation rec { ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; - dontPatchELF = true; - dontStrip = true; - preFixup = '' find $out -type f | while read f; do - patchelf $f > /dev/null 2>&1 || continue + patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true done diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix index 98b126e85f8..c4c1ebc1d8a 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -24,7 +24,10 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; installPhase = '' mkdir -p $out @@ -32,12 +35,9 @@ stdenv.mkDerivation rec { ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; - dontPatchELF = true; - dontStrip = true; - preFixup = '' find $out -type f | while read f; do - patchelf $f > /dev/null 2>&1 || continue + patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true done diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix index 8ed47b91e5d..7cbb3699401 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/development/libraries/a52dec/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "a52dec-0.7.4p4"; + pname = "a52dec"; + version = "0.7.4"; src = fetchurl { - url = "${meta.homepage}/files/a52dec-0.7.4.tar.gz"; - sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2"; + url = "${meta.homepage}/files/${pname}-${version}.tar.gz"; + sha256 = "oh1ySrOzkzMwGUNTaH34LEdbXfuZdRPu9MJd5shl7DM="; }; configureFlags = [ @@ -18,10 +19,10 @@ stdenv.mkDerivation rec { # but it's better to disable tests than loose ASLR on i686 doCheck = !stdenv.isi686; - meta = { + meta = with stdenv.lib; { description = "ATSC A/52 stream decoder"; - homepage = "http://liba52.sourceforge.net/"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2; + homepage = "https://liba52.sourceforge.net/"; + platforms = platforms.unix; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index 7de8968e061..1e6e0e8f8fa 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -4,30 +4,36 @@ let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.07"; - url = "https://github.com/xavierleroy/camlzip/archive/rel107.tar.gz"; - sha256 = "1pdz3zyiczm6c46zfgag2frwq3ljlq044p3a2y4wm2wb4pgz8k9g"; + version = "1.10"; + url = "https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz"; + sha256 = "X0YcczaQ3lFeJEiTIgjSSZ1zi32KFMtmZsP0FFpyfbI="; patches = []; - installTargets = [ "install-findlib" ]; + postPatchInit = '' + cp META-zip META-camlzip + echo 'directory="../zip"' >> META-camlzip + ''; } else { version = "1.05"; download_id = "1037"; url = "http://forge.ocamlcore.org/frs/download.php/${param.download_id}/camlzip-${param.version}.tar.gz"; sha256 = "930b70c736ab5a7ed1b05220102310a0a2241564786657abe418e834a538d06b"; patches = [./makefile_1_05.patch]; - installTargets = [ "install" ]; + postPatchInit = '' + substitute ${./META} META --subst-var-by VERSION "${param.version}" + ''; }; in stdenv.mkDerivation { - name = "camlzip-${param.version}"; + pname = "camlzip"; + version = param.version; src = fetchurl { inherit (param) url; inherit (param) sha256; }; - buildInputs = [ocaml findlib]; + buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [zlib]; @@ -35,8 +41,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - postPatch = '' - substitute ${./META} META --subst-var-by VERSION "${param.version}" + postPatch = param.postPatchInit + '' substituteInPlace Makefile \ --subst-var-by ZLIB_LIBDIR "${zlib.out}/lib" \ --subst-var-by ZLIB_INCLUDE "${zlib.dev}/include" @@ -44,13 +49,11 @@ stdenv.mkDerivation { buildFlags = [ "all" "allopt" ]; - inherit (param) installTargets; - postInstall = '' ln -s $out/lib/ocaml/${ocaml.version}/site-lib/{,caml}zip ''; - meta = { + meta = with stdenv.lib; { homepage = "http://cristal.inria.fr/~xleroy/software.html#camlzip"; description = "A library for handling ZIP and GZIP files in OCaml"; longDescription = '' @@ -60,8 +63,6 @@ stdenv.mkDerivation { ''; license = "LGPL+linking exceptions"; platforms = ocaml.meta.platforms or []; - maintainers = [ - stdenv.lib.maintainers.maggesi - ]; + maintainers = with maintainers; [ maggesi ]; }; } diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index 3d26914d4f9..f55b09f6991 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "radeontop"; - version = "2019-06-03"; + version = "1.3"; src = fetchFromGitHub { - sha256 = "1b1m30r2nfwqkajqw6m01xmfhlq83z1qylyijxg7962mp9x2k0gw"; - rev = "v1.2"; + sha256 = "sha256-tnIxM0+RfOIt714fEUWRP/4rEPHaOuCZFit9/RPdxis="; + rev = "v${version}"; repo = "radeontop"; owner = "clbr"; }; diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index 0ece2f83600..e2746c7a1e7 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = { description = "The USBGuard software framework helps to protect your computer against BadUSB"; homepage = "https://usbguard.github.io/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.tnias ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a72b2fe6d9..0eec2b4909c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9488,7 +9488,8 @@ in gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 {}; gcc-arm-embedded-8 = callPackage ../development/compilers/gcc-arm-embedded/8 {}; gcc-arm-embedded-9 = callPackage ../development/compilers/gcc-arm-embedded/9 {}; - gcc-arm-embedded = gcc-arm-embedded-9; + gcc-arm-embedded-10 = callPackage ../development/compilers/gcc-arm-embedded/10 {}; + gcc-arm-embedded = gcc-arm-embedded-10; gdc = gdc9; gdc9 = wrapCC (gcc9.cc.override {