diff --git a/lib/strings.nix b/lib/strings.nix index be217cb06469..af26532aa430 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -193,7 +193,7 @@ rec { normalizePath "/a//b///c/" => "/a/b/c/" */ - normalizePath = s: (builtins.foldl' (x: y: if y == "/" && hasSuffix "/" x then x else x+y) "" (splitString "" s)); + normalizePath = s: (builtins.foldl' (x: y: if y == "/" && hasSuffix "/" x then x else x+y) "" (stringToCharacters s)); /* Depending on the boolean `cond', return either the given string or the empty string. Useful to concatenate against a bigger string. diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 5b8ad73b257b..4c3a4bd98844 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -364,6 +364,11 @@ in ln -s $out/bin/soffice $out/bin/libreoffice ln -s $out/lib/libreoffice/share/xdg $out/share/applications + for f in $out/share/applications/*.desktop; do + substituteInPlace "$f" \ + --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice" + done + cp -r sysui/desktop/icons "$out/share" sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop diff --git a/pkgs/desktops/arcan/arcan/default.nix b/pkgs/desktops/arcan/arcan/default.nix index bfb29e2d869d..22c214728f2b 100644 --- a/pkgs/desktops/arcan/arcan/default.nix +++ b/pkgs/desktops/arcan/arcan/default.nix @@ -58,13 +58,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal"; - version = "0.6.2"; + version = "0.6.2.1"; src = fetchFromGitHub { owner = "letoram"; repo = "arcan"; rev = finalAttrs.version; - hash = "sha256-Qwyt927eLqaCqJ4Lo4J1lQX2A24ke+AH52rmSCTnpO0="; + hash = "sha256-7H3fVSsW5VANLqwhykY+Q53fPjz65utaGksh/OpZnJM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 12e863b2070e..fb0f8b2ce2c8 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -1,44 +1,62 @@ -{lib, stdenv, fetchurl}: +{ lib +, stdenv +, fetchurl +, installShellFiles +}: -let - inherit (stdenv.hostPlatform) system; - version = "21b"; - downloadUrl = arch: - "http://common-lisp.net/project/cmucl/downloads/release/" + - "${version}/cmucl-${version}-${arch}.tar.bz2"; - fetchDist = {arch, sha256}: fetchurl { - url = downloadUrl arch; - inherit sha256; - }; - dist = - if system == "i686-linux" then fetchDist { - arch = "x86-linux"; - sha256 = "13k3b5ygnbsq6n2i3r5i4ljw3r1qlskn2p5f4x9hrx6vfvbb3k7a"; - } - else throw "Unsupported platform for cmucl."; -in - -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "cmucl-binary"; - inherit version; + version = "21d"; - buildCommand = '' - mkdir -p $out - tar -C $out -xjf ${dist} + srcs = [ + (fetchurl { + url = "http://common-lisp.net/project/cmucl/downloads/release/" + + finalAttrs.version + "/cmucl-${finalAttrs.version}-x86-linux.tar.bz2"; + hash = "sha256-RdctcqPTtQh1Yb3BrpQ8jtRFQn85OcwOt1l90H6xDZs="; + }) + (fetchurl { + url = "http://common-lisp.net/project/cmucl/downloads/release/" + + finalAttrs.version + "/cmucl-${finalAttrs.version}-x86-linux.extra.tar.bz2"; + hash = "sha256-zEmiW3m5VPpFgPxV1WJNCqgYRlHMovtaMXcgXyNukls="; + })]; + + sourceRoot = "."; + + outputs = [ "out" "doc" "man" ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -pv $out $doc/share $man + mv bin lib -t $out + mv -v doc -t $doc/share + installManPage man/man1/* + + runHook postInstall + ''; + + postFixup = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/bin/lisp ''; - meta = { + meta = with lib; { + homepage = "http://www.cons.org/cmucl/"; description = "The CMU implementation of Common Lisp"; longDescription = '' CMUCL is a free implementation of the Common Lisp programming language which runs on most major Unix platforms. It mainly conforms to the ANSI Common Lisp standard. ''; - license = lib.licenses.free; # public domain - homepage = "http://www.cons.org/cmucl/"; + license = licenses.publicDomain; maintainers = [ ]; - platforms = lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 4fe8db4d2977..7673bb2279be 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -109,6 +109,9 @@ in { buildPhase = '' runHook preBuild local HOME=$TMPDIR + '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + sed -i "s/aarch64/arm64/g" makefile + '' + '' make -j$NIX_BUILD_CORES ./bin/nim c --parallelBuild:$NIX_BUILD_CORES koch ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index 9c89b27d371f..4df73c752e5d 100644 --- a/pkgs/development/libraries/asio/default.nix +++ b/pkgs/development/libraries/asio/default.nix @@ -1,6 +1,6 @@ {callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.16.1"; - sha256 = "1333ca6lnsdck4fsgjpbqf4lagxsnbg9970wxlsrinmwvdvdnwg2"; + version = "1.24.0"; + sha256 = "sha256-iXaBLCShGGAPb88HGiBgZjCmmv5MCr7jsN6lKOaCxYU="; }) diff --git a/pkgs/development/tools/protoc-gen-validate/default.nix b/pkgs/development/tools/protoc-gen-validate/default.nix index 435386ea45ef..a9370f50155c 100644 --- a/pkgs/development/tools/protoc-gen-validate/default.nix +++ b/pkgs/development/tools/protoc-gen-validate/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-validate"; - version = "0.6.12"; + version = "0.6.13"; src = fetchFromGitHub { - owner = "envoyproxy"; + owner = "bufbuild"; repo = "protoc-gen-validate"; rev = "v${version}"; - sha256 = "sha256-JoOTIteE4/IFsVVXcRI1KYpRONjo3veQ6uCtxYFlz8Y="; + sha256 = "sha256-w3qtDMRuMRTjNNjkCBzjgvtzgYABLm/OL94p9M8Db6U="; }; vendorSha256 = "sha256-vFi1DT7o2fyzxO/aZHtdsU1/G/sGmamqZPeql0vQVjs="; diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index e67a6a696d69..243c23ee52d3 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -1,43 +1,29 @@ { lib , rustPlatform , fetchFromGitHub -, curl , installShellFiles -, pkg-config -, openssl , stdenv -, darwin , nix-update-script , callPackage }: rustPlatform.buildRustPackage rec { pname = "cargo-asm"; - version = "0.1.24"; + version = "0.2.0"; src = fetchFromGitHub { owner = "pacak"; repo = "cargo-show-asm"; rev = version; - hash = "sha256-ahkKUtg5M88qddzEwYxPecDtBofGfPVxKuYKgmsbWYc="; + hash = "sha256-qsr28zuvu+i7P/MpwhDKQFFXTyFFo+vWrjBrpD1V8PY="; }; - cargoHash = "sha256-S7OpHNjiTfQg7aPmHEx6Q/OV5QA9pB29F3MTIeiLAXg="; + cargoHash = "sha256-IL+BB08uZr5fm05ITxpm66jTb+pYYlLKOwQ8uf5rKSs="; nativeBuildInputs = [ - curl.dev installShellFiles - pkg-config ]; - buildInputs = [ - curl - openssl - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - CoreFoundation - SystemConfiguration - ]); - postInstall = '' installShellCompletion --cmd cargo-asm \ --bash <($out/bin/cargo-asm --bpaf-complete-style-bash) \ diff --git a/pkgs/tools/misc/octosql/default.nix b/pkgs/tools/misc/octosql/default.nix index 0b08a6bcd0d7..dde2f2726131 100644 --- a/pkgs/tools/misc/octosql/default.nix +++ b/pkgs/tools/misc/octosql/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "octosql"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "cube2222"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ao1c0oCgrn0XGCMlIhvHqCnWIIiLejp7gfkK0guIDrI="; + sha256 = "sha256-UXHNA53ipGybYYAu+Ml8tI+9YZPW18BLsVjkW/UNQag="; }; vendorSha256 = "sha256-as8vJmUH0mDPQ8K6D5yRybPV5ibvHEtyQjArXjimGpo=";