diff options
Diffstat (limited to 'pkgs/applications')
14 files changed, 62 insertions, 71 deletions
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 61484bc2fbb..e741f6fe298 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, intltool, libgpod, curl, flac, - gnome, gtk3, gettext, perlPackages, flex, libid3tag, gdl, - libvorbis, gdk-pixbuf }: +{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, intltool, libgpod, libxml2, curl, flac +, gnome, gtk3, gettext, perlPackages, flex, libid3tag, gdl +, libvorbis, gdk-pixbuf +}: stdenv.mkDerivation rec { version = "2.1.5"; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; buildInputs = [ curl gettext - flex libgpod libid3tag flac libvorbis gtk3 gdk-pixbuf + flex libgpod libid3tag flac libvorbis libxml2 gtk3 gdk-pixbuf gdl gnome.adwaita-icon-theme gnome.anjuta ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index f0ee51dde3c..86eb399dd44 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -49,7 +49,7 @@ let dontAutoPatchelf = true; postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) '' ( - cd $out/clion-${version} + cd $out/clion # bundled cmake does not find libc rm -rf bin/cmake/linux ln -s ${cmake} bin/cmake/linux diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index a08f75d3b71..862863bddda 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -13,6 +13,7 @@ , gdk-pixbuf , pango , gettext +, itstool }: python3.pkgs.buildPythonApplication rec { @@ -38,6 +39,7 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook glib gettext + itstool ]; buildInputs = [ diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 25685b2e125..9d7a4fcd94c 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -42,12 +42,17 @@ stdenv.mkDerivation { ''; installPhase = '' + runHook preInstall install -D ${mainProgram} $out/bin/${mainProgram} runHook postInstall ''; - postInstall = "installShellCompletion --cmd ${mainProgram}" + lib.concatMapStrings - (s: " --${s} <($out/bin/${mainProgram} completion ${s})") [ "bash" "fish" "zsh" ]; + postInstall = '' + installShellCompletion --cmd ${mainProgram} \ + --bash <($out/bin/${mainProgram} completion bash) \ + --fish <($out/bin/${mainProgram} completion fish) \ + --zsh <($out/bin/${mainProgram} completion zsh) + ''; dontStrip = stdenv.isDarwin; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index d8fd18f9de4..317613ffd53 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.24.0"; + version = "1.24.1"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-Em+WAI8G492h7FJTnTHFj5L7M4xBZhW4qC0MMc2JRUU="; + sha256 = "sha256-B6MWoGYNjFBUxnSqAXt2DRRjSlmgbqIC7qEoMFGQ+zU="; }; vendorSha256 = "sha256-NP+Is7Dxz4LGzx5vpv8pJOJhodAYHia1JXYfhJD54as="; diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index 5668006dfd3..d697e8412ad 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -60,6 +60,8 @@ stdenv.mkDerivation rec { "-Dsvg-backend=${withSVGBackend}" ]; + CFLAGS = "-Wno-error=comment"; # https://gitlab.gnome.org/GNOME/librsvg/-/issues/856 + meta = with lib; { description = "Wayland-native application launcher, similar to rofi’s drun mode"; homepage = "https://codeberg.org/dnkl/fuzzel"; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 42671f5d974..2034f1761f2 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoconf-archive , autoreconfHook , cmocka @@ -10,7 +9,7 @@ , expect , glib , glibcLocales -, libmesode +, libstrophe , libmicrohttpd , libotr , libuuid @@ -36,34 +35,17 @@ assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null; stdenv.mkDerivation rec { pname = "profanity"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - hash = "sha256-8WGHOy0fSW8o7vMCYZqqpvDsn81JZefM6wGfjQ5iKbU="; + hash = "sha256-kmixWp9Q2tMVp+tk5kbTdBfgRNghKk3+48L582hqlm8="; }; patches = [ ./patches/packages-osx.patch - - # pullupstream fixes for ncurses-6.3 - (fetchpatch { - name = "ncurses-6.3-p1.patch"; - url = "https://github.com/profanity-im/profanity/commit/e5b6258c997d4faf36e2ffb8a47b386c5629b4eb.patch"; - sha256 = "sha256-4rwpvsgfIQ60GcLS0O7Hyn7ZidREjYT+dVND54z0zrw="; - }) - (fetchpatch { - name = "ncurses-6.3-p2.patch"; - url = "https://github.com/profanity-im/profanity/commit/fd9ccec8dc604902bbb1d444dba4223ccee0a092.patch"; - sha256 = "sha256-4gZaXoDNulBIR+e6y/9bJKXVactCHWS8H8lPJaJwVwE="; - }) - (fetchpatch { - name = "ncurses-6.3-p3.patch"; - url = "https://github.com/profanity-im/profanity/commit/242696f09a49c8446ba6aef8bdad65fb58a77715.patch"; - sha256 = "sha256-BOYHkae9aIA7HaVM23Yu25TTK9e3SuV+u0FEi7Sn62I="; - }) ]; enableParallelBuilding = true; @@ -81,7 +63,7 @@ stdenv.mkDerivation rec { expat expect glib - libmesode + libstrophe libmicrohttpd libotr libuuid diff --git a/pkgs/applications/office/hledger-check-fancyassertions/default.nix b/pkgs/applications/office/hledger-check-fancyassertions/default.nix index df3752eac3e..6edef5b621b 100644 --- a/pkgs/applications/office/hledger-check-fancyassertions/default.nix +++ b/pkgs/applications/office/hledger-check-fancyassertions/default.nix @@ -1,17 +1,13 @@ {lib, stdenvNoCC, haskellPackages, fetchurl, writers}: -let - hledger-lib = haskellPackages.hledger-lib_1_24_1; -in - stdenvNoCC.mkDerivation rec { pname = "hledger-check-fancyassertions"; - inherit (hledger-lib) version; + inherit (haskellPackages.hledger-lib) version; src = fetchurl { name = "hledger-check-fancyassertion-${version}.hs"; url = "https://raw.githubusercontent.com/simonmichael/hledger/hledger-lib-${version}/bin/hledger-check-fancyassertions.hs"; - sha256 = "0naggvivc6szsc8haa52a6lm079ikz5qfva0ljnqx0f1zlkxv984"; + sha256 = "1xy3ssxnwybq40nlffz95w7m9xbzf8ysb13svg0i8g5sfgrw11vk"; }; dontUnpack = true; @@ -20,13 +16,12 @@ stdenvNoCC.mkDerivation rec { executable = writers.writeHaskell "hledger-check-fancyassertions" { - libraries = [ + libraries = with haskellPackages; [ hledger-lib - ] ++ (with haskellPackages; [ base base-compat base-compat-batteries filepath megaparsec microlens optparse-applicative string-qq text time transformers - ]); + ]; inherit (haskellPackages) ghc; } src; diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index b461b2ba19e..a9fce9ff8ed 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.4.4"; + version = "2.5.0"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-5/85ro206o3SsvAvcZeDD2Dmo2jU4zXmtI3X4WdQaRI="; + sha256 = "sha256-6hBhfJ18ROCfmqoxrJZ5TiYCFb1xZKsJeobXFy5yfQM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index d319dbe3e70..18b1e46fde2 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -2,17 +2,17 @@ , libiconv, Security }: rustPlatform.buildRustPackage rec { - version = "0.6.2"; + version = "0.6.3"; pname = "rink"; src = fetchFromGitHub { owner = "tiffany352"; repo = "rink-rs"; rev = "v${version}"; - sha256 = "sha256-l2Rj15zaJm94EHwvOssfvYQNOoWj45Nq9M85n+A0vo4="; + sha256 = "sha256-AhC3c6CpV0tlD6d/hFWt7hGj2UsXsOCeujkRSDlpvCM="; }; - cargoSha256 = "sha256-GhuvwVkDRFjC6BghaNMFZZG9hResTN1u0AuvIXlFmig="; + cargoSha256 = "sha256-Xo5iYwL4Db+GWMl5UXbPmj0Y0PJYR4Q0aUGnYCd+NB8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 36b813f547e..3a66a4d8af7 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-NvVm/deO4LSIl5TSziqsrGt9atCXjt4UZ/VJfmX3i4c="; + sha256 = "sha256-edlGJD+80k1ySpyNcKc5c2O0MX+S4fQgH5mwHQUxXM8="; }; - vendorSha256 = "sha256-pBjg6WyD61+Bl3ttcpl/b9XoWBCi7cDvE8NPaZGu7Aw="; + vendorSha256 = "sha256-YLkNua0Pz0gVIYnWOzOlV5RuLBaoZ4l7l1Pf4QIfUVQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/video/entangle/default.nix b/pkgs/applications/video/entangle/default.nix index 2c756338089..761a3849c31 100644 --- a/pkgs/applications/video/entangle/default.nix +++ b/pkgs/applications/video/entangle/default.nix @@ -1,7 +1,8 @@ { lib , stdenv , fetchFromGitLab -, cmake +, fetchpatch +, itstool , libxml2 , meson , ninja @@ -49,10 +50,19 @@ stdenv.mkDerivation rec { sha256 = "hz2WSDOjriQSavFlDT+35x1X5MeInq80ZrSP1WR/td0="; }; + patches = [ + # Fix build with meson 0.61, can be removed on next update + # https://gitlab.com/entangle/entangle/-/issues/67 + (fetchpatch { + url = "https://gitlab.com/entangle/entangle/-/commit/54795d275a93e94331a614c8712740fcedbdd4f0.patch"; + sha256 = "iEgqGjKa0xwSdctwvNdEV361l9nx+bz53xn3fuDgtzY="; + }) + ]; + nativeBuildInputs = [ - cmake - glib.dev - libxml2.bin # for xmllint + itstool + glib + libxml2 # for xmllint meson ninja perl # for pod2man and build scripts @@ -93,8 +103,6 @@ stdenv.mkDerivation rec { libXtst ]); - dontUseCmakeConfigure = true; - # Disable building of doc/reference since it requires network connection to render XML to HTML # Patch build script shebangs postPatch = '' diff --git a/pkgs/applications/virtualization/arion/default.nix b/pkgs/applications/virtualization/arion/default.nix index 33b2b000cbf..efe13868524 100644 --- a/pkgs/applications/virtualization/arion/default.nix +++ b/pkgs/applications/virtualization/arion/default.nix @@ -16,11 +16,16 @@ let - make it self-contained by including docker-compose */ arion = - justStaticExecutables ( + (justStaticExecutables ( overrideCabal cabalOverrides arion-compose - ); + ) + ).overrideAttrs (o: { + # Patch away the arion-compose name. Unlike the Haskell library, the program + # is called arion (arion was already taken on hackage). + pname = "arion"; + }); inherit (haskell.lib.compose) justStaticExecutables overrideCabal; @@ -31,9 +36,6 @@ let passthru = (o.passthru or {}) // { inherit eval build; }; - # Patch away the arion-compose name. Unlike the Haskell library, the program - # is called arion (arion was already taken on hackage). - pname = "arion"; src = arion-compose.src; # PYTHONPATH diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/applications/virtualization/spike/default.nix index cc2489356c5..291328ee7fe 100644 --- a/pkgs/applications/virtualization/spike/default.nix +++ b/pkgs/applications/virtualization/spike/default.nix @@ -1,27 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, dtc, fetchpatch, pkgsCross }: +{ lib, stdenv, fetchFromGitHub, dtc, pkgsCross }: stdenv.mkDerivation rec { pname = "spike"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "riscv"; repo = "riscv-isa-sim"; rev = "v${version}"; - sha256 = "1hcl01nj96s3rkz4mrq747s5lkw81lgdjdimb8b1b9h8qnida7ww"; + sha256 = "sha256-4D2Fezej0ioOOupw3kgMT5VLs+/jXQjwvek6v0AVMzI="; }; nativeBuildInputs = [ dtc ]; enableParallelBuilding = true; - patches = [ - # Add missing headers to fix build. - (fetchpatch { - url = "https://github.com/riscv/riscv-isa-sim/commit/b3855682c2d744c613d2ffd6b53e3f021ecea4f3.patch"; - sha256 = "1v1mpp4iddf5n4h3kmj65g075m7xc31bxww7gldnmgl607ma7cnl"; - }) - ]; - postPatch = '' patchShebangs scripts/*.sh patchShebangs tests/ebreak.py @@ -39,7 +31,9 @@ stdenv.mkDerivation rec { '' runHook preInstallCheck - $out/bin/spike -m64 ${riscvPkgs.riscv-pk}/bin/pk ${riscvPkgs.hello}/bin/hello | grep -Fq "Hello, world" + echo -e "#include<stdio.h>\nint main() {printf(\"Hello, world\");return 0;}" > hello.c + ${riscvPkgs.stdenv.cc}/bin/riscv64-none-elf-gcc -o hello hello.c + $out/bin/spike -m64 ${riscvPkgs.riscv-pk}/bin/pk hello | grep -Fq "Hello, world" runHook postInstallCheck ''; |