diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/sioyek/default.nix | 36 | ||||
-rw-r--r-- | pkgs/development/compilers/tinycc/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/web/deno/default.nix | 43 | ||||
-rw-r--r-- | pkgs/development/web/deno/librusty_v8.nix | 10 | ||||
-rw-r--r-- | pkgs/development/web/deno/update/librusty_v8.ts | 2 | ||||
-rw-r--r-- | pkgs/tools/security/vault-medusa/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
7 files changed, 61 insertions, 46 deletions
diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index 3ea7afcbdeb4..2dc82b55df7c 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -15,21 +15,34 @@ , wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sioyek"; version = "unstable-2022-08-30"; src = fetchFromGitHub { owner = "ahrm"; - repo = pname; + repo = "sioyek"; rev = "8d0a63484334e2cb2b0571a07a3875e6ab6c8916"; sha256 = "sha256-29Wxg/VVQPDDzzxKcvMa1+rtiP4bDkPAB/JJsj+F+WQ="; }; - buildInputs = [ gumbo harfbuzz jbig2dec mupdf mujs openjpeg qt3d qtbase ] - ++ lib.optionals stdenv.isDarwin [ freetype ]; + buildInputs = [ + gumbo + harfbuzz + jbig2dec + mujs + mupdf + openjpeg + qt3d + qtbase + ] + ++ lib.optionals stdenv.isDarwin [ freetype ]; - nativeBuildInputs = [ installShellFiles wrapQtAppsHook qmake ]; + nativeBuildInputs = [ + installShellFiles + qmake + wrapQtAppsHook + ]; qmakeFlags = lib.optionals stdenv.isDarwin [ "CONFIG+=non_portable" ]; @@ -51,7 +64,7 @@ stdenv.mkDerivation rec { mkdir -p $out/Applications cp -r sioyek.app $out/Applications - '' else '' + '' else '' install -Dm644 tutorial.pdf $out/share/tutorial.pdf cp -r pdf_viewer/shaders $out/share/ install -Dm644 -t $out/etc/ pdf_viewer/{keys,prefs}.config @@ -59,11 +72,12 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Sioyek is a PDF viewer designed for reading research papers and technical books."; homepage = "https://sioyek.info/"; - changelog = "https://github.com/ahrm/sioyek/releases"; + description = "A PDF viewer designed for research papers and technical books"; + changelog = "https://github.com/ahrm/sioyek/releases/tag/v1.5.0"; license = licenses.gpl3Only; - platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.podocarp ]; + maintainers = with maintainers; [ podocarp ]; + platforms = platforms.unix; + broken = stdenv.isDarwin && stdenv.isAarch64; }; -} +}) diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 97a86a3fa783..21eb497a116a 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -8,6 +8,10 @@ , which }: +let + # avoid "malformed 32-bit x.y.z" error on mac when using clang + isCleanVer = version: builtins.match "^[0-9]\\.+[0-9]+\\.[0-9]+" version != null; +in stdenv.mkDerivation rec { pname = "tcc"; version = "unstable-2022-07-15"; @@ -62,7 +66,11 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - echo ${version} > VERSION + ${ + if stdenv.isDarwin && ! isCleanVer version + then "echo 'not overwriting VERSION since it would upset ld'" + else "echo ${version} > VERSION" + } configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)") ''; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 484f5a3d6b97..a28b0dba4b62 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , rustPlatform , installShellFiles -, fetchpatch , tinycc , libiconv , libobjc @@ -16,38 +15,17 @@ , librusty_v8 ? callPackage ./librusty_v8.nix { } }: -let - libtcc = tinycc.overrideAttrs (oa: { - makeFlags = [ "libtcc.a" ]; - # tests want tcc binary - doCheck = false; - outputs = [ "out" ]; - installPhase = '' - mkdir -p $out/lib/ - mv libtcc.a $out/lib/ - ''; - }); -in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.23.4"; + version = "1.25.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nLQqfLRuh9mhZfjeiPaGpQbi5bXEg7HiGwrwDmaIRWM="; + sha256 = "sha256-nKMQDfCU1HsOfdzVwmgCIWa/rUmvufHlsS9jcDwcZzw="; }; - cargoSha256 = "sha256-l5Ce/ypYXZKEi859OFskwC/Unpo842ZPxIHvp6lCjQc="; - - patches = [ - # remove after https://github.com/denoland/deno/pull/15193 is in a release - (fetchpatch { - name = "byo-tcc.patch"; - url = "https://github.com/denoland/deno/pull/15193/commits/c43698b2b58af1ef69b1558d55c8ebea0268dfea.patch"; - sha256 = "sha256-YE5mGHyEm20FjFhr8yveBRlrOVL3+qQYxz2xp/IfmJs="; - }) - ]; + cargoSha256 = "sha256-jFoVQK74gnhC6Ume/PHe8NG7rNeTkwPMBBWn/hT7nCs="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds @@ -68,7 +46,20 @@ rustPlatform.buildRustPackage rec { # The deno_ffi package currently needs libtcc.a on linux and macos and will try to compile it at build time # To avoid this we point it to our copy (dir) # In the future tinycc will be replaced with asm - DENO_FFI_LIBTCC = "${libtcc}/lib"; + libtcc = tinycc.overrideAttrs (oa: { + makeFlags = [ "libtcc.a" ]; + # tests want tcc binary + doCheck = false; + outputs = [ "out" ]; + installPhase = '' + mkdir -p $out/lib/ + mv libtcc.a $out/lib/ + ''; + # building the whole of tcc on darwin is broken in nixpkgs + # but just building libtcc.a works fine so mark this as unbroken + meta.broken = false; + }); + TCC_PATH = "${libtcc}/lib"; # Tests have some inconsistencies between runs with output integration tests # Skipping until resolved diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 1e6626b1e9e1..f173057db15a 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.45.0"; + version = "0.49.0"; shas = { - x86_64-linux = "sha256-yZw6zwEhJyRntqOmyk03N+sHxzIrbY/e67AQ21ePlAU="; - aarch64-linux = "sha256-2p21Smm5wZycv9u+yDbyerKTjSTB7yau5WC2aJ+Vr8w="; - x86_64-darwin = "sha256-HO287V+iBwdqKZUWhZJnuGJO9RE4wGG4cQMN8CkB7WQ="; - aarch64-darwin = "sha256-ekoMhWMQpBUdM7R7i82NWrNtQMNqCujNYy1ijOxT64U="; + x86_64-linux = "sha256-l6+NdMzYI9r2aHU7/OUhbgmc/LmAZjEFL8y8GrJ+EX8="; + aarch64-linux = "sha256-uo+/Wsrlkm+xotoIr8xlQWoiWzMz02TKFW+olfXtpz8="; + x86_64-darwin = "sha256-gWxljTgt6aXUzwex2zu46B9YzTvhN0Pi9C1Ll1eiohg="; + aarch64-darwin = "sha256-/UnBIQ/wA/0biIG9vIDKylhqFJ8QCoqjKH7xiePZ/eg="; }; } diff --git a/pkgs/development/web/deno/update/librusty_v8.ts b/pkgs/development/web/deno/update/librusty_v8.ts index 3f2ad8d7b2a3..7ee4c855741f 100644 --- a/pkgs/development/web/deno/update/librusty_v8.ts +++ b/pkgs/development/web/deno/update/librusty_v8.ts @@ -27,7 +27,7 @@ const getLibrustyV8Version = async ( ) => fetch(`https://github.com/${owner}/${repo}/raw/${version}/core/Cargo.toml`) .then((res) => res.text()) - .then((txt) => mod.parse(txt).dependencies.v8.version); + .then((txt) => toml.parse(txt).dependencies.v8.version); const fetchArchShaTasks = (version: string, arches: Architecture[]) => arches.map( diff --git a/pkgs/tools/security/vault-medusa/default.nix b/pkgs/tools/security/vault-medusa/default.nix index 552fa90a4c14..f248890ad03b 100644 --- a/pkgs/tools/security/vault-medusa/default.nix +++ b/pkgs/tools/security/vault-medusa/default.nix @@ -17,6 +17,6 @@ buildGoModule rec { description = "A cli tool for importing and exporting Hashicorp Vault secrets"; homepage = "https://github.com/jonasvinther/medusa"; license = licenses.mit; - maintainers = with maintainers; [ "bpaulin" ]; + maintainers = with maintainers; [ onny ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af5d2e99705e..54975fd0bbfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30769,7 +30769,9 @@ with pkgs; simple-scan = gnome.simple-scan; - sioyek = libsForQt5.callPackage ../applications/misc/sioyek { }; + sioyek = callPackage ../applications/misc/sioyek { + inherit (libsForQt5) qmake qt3d qtbase wrapQtAppsHook; + }; siproxd = callPackage ../applications/networking/siproxd { }; |