diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c78d616748ab..167898fc6ad2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7555,6 +7555,12 @@ githubId = 44045911; name = "Kid"; }; + kidsan = { + email = "8798449+Kidsan@users.noreply.github.com"; + github = "kidsan"; + githubId = 8798449; + name = "kidsan"; + }; kierdavis = { email = "kierdavis@gmail.com"; github = "kierdavis"; @@ -14224,6 +14230,12 @@ githubId = 3268082; name = "Thibaut Marty"; }; + thled = { + name = "Thomas Le Duc"; + email = "dev@tleduc.de"; + github = "thled"; + githubId = 28220902; + }; thyol = { name = "thyol"; email = "thyol@pm.me"; diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix index 47a36ed1b5df..8055683a3fcf 100644 --- a/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/pkgs/applications/audio/ladspa-sdk/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl }: + stdenv.mkDerivation rec { pname = "ladspa-sdk"; version = "1.15"; @@ -7,12 +8,27 @@ stdenv.mkDerivation rec { sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2"; }; + sourceRoot = "ladspa_sdk_${version}/src"; + + strictDeps = true; + patchPhase = '' - cd src sed -i 's@/usr/@$(out)/@g' Makefile - sed -i 's@-mkdirhier@mkdir -p@g' Makefile ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CPP=${stdenv.cc.targetPrefix}c++" + ]; + + # The default target also runs tests, which we don't want to do in + # the build phase as it would break cross. + buildFlags = [ "targets" ]; + + # Tests try to create and play a sound file. Playing will fail, but + # it's probably still useful to run the part that creates the file. + doCheck = true; + meta = { description = "The SDK for the LADSPA audio plugin standard"; longDescription = '' diff --git a/pkgs/applications/misc/kord/default.nix b/pkgs/applications/misc/kord/default.nix new file mode 100644 index 000000000000..d42025a643bc --- /dev/null +++ b/pkgs/applications/misc/kord/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, alsa-lib +}: + +rustPlatform.buildRustPackage rec { + pname = "kord"; + version = "0.4.2"; + + # kord depends on nightly features + RUSTC_BOOTSTRAP = 1; + + src = fetchFromGitHub { + owner = "twitchax"; + repo = "kord"; + rev = "v${version}"; + sha256 = "sha256-B/UwnbzXI3ER8IMOVtn0ErVqFrkZXKoL+l7ll1AlzDg="; + }; + + cargoHash = "sha256-xhWSycTe72HW3E9meTo4wjOCHDcNq6fUPT6nqHoW9vE="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsa-lib ]; + + meta = with lib; { + description = "A music theory binary and library for Rust"; + homepage = "https://github.com/twitchax/kord"; + maintainers = with maintainers; [ kidsan ]; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 138af6cc511c..7bf6fdfe0bcb 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -13,13 +13,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "rkd77"; repo = "felinks"; rev = "v${version}"; - sha256 = "sha256-9OEi4UF/4/IRtccJou3QuevQzWjA6PuU5IVlT7qqGZ0="; + sha256 = "sha256-4+V1j78sjs3/6SnVLO34jCcNuegpZan8Ykd8Gy0vc3k="; }; buildInputs = [ @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { "--enable-nntp" "--enable-256-colors" "--enable-true-color" + "--with-brotli" "--with-lzma" "--with-libev" "--with-terminfo" diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 3657a1e38e7f..557754ac50f8 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "43.0"; + version = "43.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-fvG9N6HuuO8BMH8MJRquMSe1oEPNmX/pzsJX5yzs1CY="; + hash = "sha256-gHlhbQGtdIjKLMAkTxfc2QOjvNUPGKKL+OK8/vm0Oac="; }; outputs = [ "out" "devdoc" ]; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 9933e8056670..705b10753ca4 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,55 +1,52 @@ { lib , buildGoModule , fetchFromGitHub -, libkrb5 -, git +, gpgme , installShellFiles , testers , openshift }: - buildGoModule rec { pname = "openshift"; - version = "4.11.0"; - gitCommit = "20dd77d5"; + version = "4.12.0"; + gitCommit = "854f807"; src = fetchFromGitHub { owner = "openshift"; repo = "oc"; - rev = "20dd77d5c889f86b05e2bdd182853ae702852c63"; - sha256 = "wqLo/CKGzeMDJUoI9PUEjJER5hSPu+FmUCJLPZ9PJuw="; + rev = "854f807d8a84dde710c062a5281bca5bc07cb562"; + hash = "sha256-GH3LjAeMIHmFbJoKGoeeNteP4Ma2+kIC5rAxObdziKg="; }; - vendorSha256 = null; + vendorHash = null; - buildInputs = [ libkrb5 ]; + buildInputs = [ gpgme ]; nativeBuildInputs = [ installShellFiles ]; - patchPhase = '' - patchShebangs ./hack - ''; + ldflags = [ + "-s" + "-w" + "-X github.com/openshift/oc/pkg/version.commitFromGit=${gitCommit}" + "-X github.com/openshift/oc/pkg/version.versionFromGit=v${version}" + ]; - buildPhase = '' - # Openshift build require this variables to be set - # unless there is a .git folder which is not the case with fetchFromGitHub - export SOURCE_GIT_COMMIT=${gitCommit} - export SOURCE_GIT_TAG=v${version} - export SOURCE_GIT_TREE_STATE=clean - - make all - ''; - - installPhase = '' - mkdir -p $out/bin - cp oc $out/bin + doCheck = false; + postInstall = '' + # Install man pages. mkdir -p man - ./genman man oc + $out/bin/genman man oc installManPage man/*.1 - installShellCompletion --bash contrib/completions/bash/* - installShellCompletion --zsh contrib/completions/zsh/* + # Remove unwanted tooling. + rm $out/bin/clicheck $out/bin/gendocs $out/bin/genman + + # Install shell completions. + installShellCompletion --cmd oc \ + --bash <($out/bin/oc completion bash) \ + --fish <($out/bin/oc completion fish) \ + --zsh <($out/bin/oc completion zsh) ''; passthru.tests.version = testers.testVersion { diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index 22ea41ec4343..e280b7390035 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.9.35"; + version = "2.9.38"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-tRuT4freMDtFjmZuBV9WD9jQFUat8QAias5d+AN7IVo="; + sha256 = "sha256-QTO6MHiFx3nDXDaaVy7rCiR0ttBXt5oAw94/ZDTICOM="; }; - vendorSha256 = "sha256-2MevXSjjwXDjmiMhiZyv45a3OgDrliVcvHbXGRIOu1s="; + vendorHash = "sha256-QOu1azw3OUWaz7MRFGZ5CGX4bVegbFYp76/XpesnaUM="; # Disable tests because it attempts to use a mongodb instance doCheck = false; diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix index a35f918ff5a0..dfd9d50b1951 100644 --- a/pkgs/applications/networking/rymdport/default.nix +++ b/pkgs/applications/networking/rymdport/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "rymdport"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "Jacalz"; repo = "rymdport"; rev = "v${version}"; - hash = "sha256-kAEkeRAS+gMjdriop4tQcqc+GldldxOn+QwgWTl8XB0="; + hash = "sha256-IsUKZL1aOKH01yZ7e/ciAESQKdZSscH+ytI3wptChy0="; }; - vendorHash = "sha256-rZHM0HwiTNbUuJmlNOHg/XoYxqrKt59l5BL/vjm4Hfk="; + vendorHash = "sha256-9Z++E4Lb1+VBvOx5GJ4yQuj7fpwUhlsMhavTifKxVw4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 6aeb63d67114..dcc13cf99cc6 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -223,6 +223,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ evils kiwi ]; # kicad is cross platform platforms = lib.platforms.all; + broken = stdenv.isDarwin; hydraPlatforms = if (with3d) then [ ] else platforms; # We can't download the 3d models on Hydra, diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 811a40585363..cc567ae7114d 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,22 +3,22 @@ { "kicad" = { kicadVersion = { - version = "6.0.10"; + version = "6.0.11"; src = { - rev = "86aedd382b4ece39e27bef209e81792915103704"; - sha256 = "0pz8d96imc0q3nh7npr5zf0jkzi94wchvw57spcrgqfac9yrld3q"; + rev = "2627ca5db025d40933329af642df28c4a2193dbf"; + sha256 = "1bhzmgs921wv1pc0mpyigmpp630086kmpifc3a91cbkv4xf0akkq"; }; }; libVersion = { - version = "6.0.10"; + version = "6.0.11"; libSources = { - symbols.rev = "3ec40517b37d78faf7ff5504c81362420c4b601f"; + symbols.rev = "c2277d1e39c5e9ba5e04ca5ef3eb252a74291375"; symbols.sha256 = "1fwnr8x345jbifk71rhyd4b88c4ijp2rcw3pmivnwfb444hbr1lp"; - templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1"; + templates.rev = "049baf307d2fdf5e6138ebab40a8be720b4ae62e"; templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; - footprints.rev = "24671f7754c74dfa528e6b62ebef33b161aa4ab6"; + footprints.rev = "72fb90dda096bd59295ccc2c8c0881ee02a1221c"; footprints.sha256 = "1rs05n1wjb2w3x7xqkkijbdxyw3fj0fph8znvnsxp9bgwaaipd4h"; - packages3d.rev = "417c4ea884a0d1501061f511730604890bbb0a35"; + packages3d.rev = "3fc9daed3ca80a1b6f3bbb1ef505f0dc79972d44"; packages3d.sha256 = "0nmvfchp25i4bkx6yf7fz1rwy7w6whj2w7mlp02ag3w5v4f137vz"; }; }; diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 7357f024c90d..1b5a0622f4e2 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ginac"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { url = "https://www.ginac.de/ginac-${version}.tar.bz2"; - sha256 = "sha256-J84Wrt/nRlGyI725JGwAWWt/+b9yeg06Rz9GcADaxJI="; + sha256 = "sha256-wks3oecJ9mDQl4eH6GszSAPNKOwXaJzzbd/zgAc+omE="; }; propagatedBuildInputs = [ cln ]; diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 1c173b75238c..9bd4cf12db03 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -4,6 +4,7 @@ , libpng ? null , eigen ? null , libtiff ? null +, enableShared ? !stdenv.hostPlatform.isStatic , enableExamples ? false , enableDocs ? false }: @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_FLAGS=-std=c++11" "-DOpenMVG_BUILD_EXAMPLES=${if enableExamples then "ON" else "OFF"}" "-DOpenMVG_BUILD_DOC=${if enableDocs then "ON" else "OFF"}" - ]; + ] ++ lib.optional enableShared "-DOpenMVG_BUILD_SHARED=ON"; cmakeDir = "./src"; diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index ad37c503c0ab..eb57866d50cb 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -30,6 +30,8 @@ obs-source-record = callPackage ./obs-source-record.nix { }; + obs-vaapi = callPackage ./obs-vaapi { }; + obs-vkcapture = callPackage ./obs-vkcapture.nix { obs-vkcapture32 = pkgsi686Linux.obs-studio-plugins.obs-vkcapture; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix index 70b6790a58a8..e58220bce7e8 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "obs-gstreamer"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitHub { owner = "fzwoch"; - repo = "obs-gstreamer"; + repo = pname; rev = "v${version}"; - hash = "sha256-zP1MMoXLp+gp0fjVbWi/Wse6I8u9/K2IeSew3OjkCkE="; + hash = "sha256-C4yee7hzkSOjIeaacLaTGPzZ1qYdYtHK5a3m9gz2pPI="; }; nativeBuildInputs = [ pkg-config meson ninja ]; @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { # - We need "getLib" instead of default derivation, otherwise it brings gstreamer-bin; # - without gst-plugins-base it won't even show proper errors in logs; # - Without gst-plugins-bad it won't find element "h264parse"; - # - gst-vaapi adds "VA-API" to "Encoder type"; # - gst-plugins-ugly adds "x264" to "Encoder type"; # Tip: "could not link appsrc to videoconvert1" can mean a lot of things, enable GST_DEBUG=2 for help. passthru.obsWrapperArguments = @@ -36,11 +35,15 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-bad - gst-plugins-ugly - gst-vaapi ]; + # Fix output directory + postInstall = '' + mkdir $out/lib/obs-plugins + mv $out/lib/obs-gstreamer.so $out/lib/obs-plugins/ + ''; + meta = with lib; { description = "An OBS Studio source, encoder and video filter plugin to use GStreamer elements/pipelines in OBS Studio"; homepage = "https://github.com/fzwoch/obs-gstreamer"; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix new file mode 100644 index 000000000000..7a8e19325090 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, gst_all_1 +, pciutils +, pkg-config +, meson +, ninja +, obs-studio +}: + +stdenv.mkDerivation rec { + pname = "obs-vaapi"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "fzwoch"; + repo = pname; + rev = version; + hash = "sha256-qA4xVVShkp40QHp2HmmRzVxQaBwskRpUNEULKetVMu8="; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = with gst_all_1; [ gstreamer gst-plugins-base obs-studio pciutils ]; + + # - We need "getLib" instead of default derivation, otherwise it brings gstreamer-bin; + # - without gst-plugins-base it won't even show proper errors in logs; + # - Without gst-plugins-bad it won't find element "vapostproc"; + # - gst-vaapi adds "VA-API" to "Encoder type"; + # Tip: "could not link appsrc to videoconvert1" can mean a lot of things, enable GST_DEBUG=2 for help. + passthru.obsWrapperArguments = + let + gstreamerHook = package: "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${lib.getLib package}/lib/gstreamer-1.0"; + in + with gst_all_1; builtins.map gstreamerHook [ + gstreamer + gst-plugins-base + gst-plugins-bad + gst-vaapi + ]; + + meta = with lib; { + description = "OBS Studio VAAPI support via GStreamer"; + homepage = "https://github.com/fzwoch/obs-vaapi"; + maintainers = with maintainers; [ ahuzik pedrohlc ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/video/obs-studio/wrapper.nix b/pkgs/applications/video/obs-studio/wrapper.nix index 5303991f1fb9..62bc80d26df3 100644 --- a/pkgs/applications/video/obs-studio/wrapper.nix +++ b/pkgs/applications/video/obs-studio/wrapper.nix @@ -24,7 +24,7 @@ symlinkJoin { "$out/bin/obs" ''--set OBS_PLUGINS_PATH "${pluginsJoined}/lib/obs-plugins"'' ''--set OBS_PLUGINS_DATA_PATH "${pluginsJoined}/share/obs/obs-plugins"'' - ] ++ pluginArguments; + ] ++ lists.unique pluginArguments; in '' ${concatStringsSep " " wrapCommandLine} diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index 647f2a2f7adc..448143f76908 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -83,9 +83,12 @@ let inherit (args) src; inherit (go) GOOS GOARCH; + prePatch = args.prePatch or ""; patches = args.patches or []; patchFlags = args.patchFlags or []; + postPatch = args.postPatch or ""; preBuild = args.preBuild or ""; + postBuild = args.postBuild or ""; sourceRoot = args.sourceRoot or ""; GO111MODULE = "on"; diff --git a/pkgs/data/themes/vimix/default.nix b/pkgs/data/themes/vimix/default.nix index 85dc0788bfba..f9dbf73b3a99 100644 --- a/pkgs/data/themes/vimix/default.nix +++ b/pkgs/data/themes/vimix/default.nix @@ -17,20 +17,20 @@ let pname = "vimix-gtk-themes"; in -lib.checkListOfEnum "${pname}: theme variants" [ "doder" "beryl" "ruby" "amethyst" "grey" ] themeVariants +lib.checkListOfEnum "${pname}: theme variants" [ "doder" "beryl" "ruby" "amethyst" "jade" "grey" "all" ] themeVariants lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants -lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants +lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" "all" ] sizeVariants lib.checkListOfEnum "${pname}: tweaks" [ "flat" "grey" "mix" "translucent" ] tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-10-30"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "QGKh2Md25VNVqy58w/LBzNnEM+g4gBMUjj0W0IuVZ1U="; + sha256 = "4IJMLSUsZvtPfuMS+NYkKo8K3laec2YJk20d5tL0vKI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 8398df6b7c12..7bdfb469c346 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "warpinator"; - version = "1.4.3"; + version = "1.4.4"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-blsDOAdfu0N6I+6ZvycL+BIIsZPIjwYm+sJnbZtHJE8="; + hash = "sha256-oHJOwdCvHnPalTHb5E3mNDYBaR9ZvlV1F6ux7nejBlc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch deleted file mode 100644 index 657ea7a260c9..000000000000 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch +++ /dev/null @@ -1,82 +0,0 @@ -From cc47fa33893e6840463ef8d59f9f4de4b7563726 Mon Sep 17 00:00:00 2001 -From: Bobby Rong -Date: Sat, 4 Dec 2021 22:00:38 +0800 -Subject: [PATCH] Add meson option for overlaying logo on wallpaper - ---- - meson.build | 8 ++++++++ - meson_options.txt | 1 + - src/Views/OperatingSystemView.vala | 8 ++++++++ - 3 files changed, 17 insertions(+) - create mode 100644 meson_options.txt - -diff --git a/meson.build b/meson.build -index 2125de6e..cbe3cadd 100644 ---- a/meson.build -+++ b/meson.build -@@ -20,6 +20,14 @@ add_project_arguments( - vapi_dir = join_paths(meson.current_source_dir(), 'vapi') - add_project_arguments(['--vapidir', vapi_dir], language: 'vala') - -+vala_flags = [] -+ -+if get_option('wallpaper') -+ vala_flags += ['--define', 'WALLPAPER'] -+endif -+ -+add_project_arguments(vala_flags, language: 'vala') -+ - subdir('data') - subdir('src') - subdir('po') -diff --git a/meson_options.txt b/meson_options.txt -new file mode 100644 -index 00000000..8cef0bb3 ---- /dev/null -+++ b/meson_options.txt -@@ -0,0 +1 @@ -+option('wallpaper', type : 'boolean', value : true, description : 'Overlay logo on default wallpaper') -diff --git a/src/Views/OperatingSystemView.vala b/src/Views/OperatingSystemView.vala -index fdb92e7e..6110d1aa 100644 ---- a/src/Views/OperatingSystemView.vala -+++ b/src/Views/OperatingSystemView.vala -@@ -39,6 +39,7 @@ public class About.OperatingSystemView : Gtk.Grid { - logo_icon_name = "distributor-logo"; - } - -+#if WALLPAPER - var logo = new Hdy.Avatar (128, "", false) { - // In case the wallpaper can't be loaded, we don't want an icon or text - icon_name = "invalid-icon-name", -@@ -53,6 +54,7 @@ public class About.OperatingSystemView : Gtk.Grid { - } - }); - logo.get_style_context ().add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); -+#endif - - var icon = new Gtk.Image () { - icon_name = logo_icon_name + "-symbolic", -@@ -64,9 +66,11 @@ public class About.OperatingSystemView : Gtk.Grid { - icon_style_context.add_class ("logo"); - icon_style_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); - -+#if WALLPAPER - var logo_overlay = new Gtk.Overlay (); - logo_overlay.add (logo); - logo_overlay.add_overlay (icon); -+#endif - - // Intentionally not using GLib.OsInfoKey.PRETTY_NAME here because we - // want more granular control over text formatting -@@ -145,7 +149,11 @@ public class About.OperatingSystemView : Gtk.Grid { - valign = Gtk.Align.CENTER, - vexpand = true - }; -+#if WALLPAPER - software_grid.attach (logo_overlay, 0, 0, 1, 4); -+#else -+ software_grid.attach (icon, 0, 0, 1, 4); -+#endif - software_grid.attach (title, 1, 0, 3); - - software_grid.attach (kernel_version_label, 1, 2, 3); diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 786539d567b1..3c9fc107a978 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -8,32 +8,27 @@ , vala , libgee , libgtop +, libgudev , libhandy , granite , gtk3 , switchboard +, udisks2 , fwupd , appstream }: stdenv.mkDerivation rec { pname = "switchboard-plug-about"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-/8K3xSbzlagOT0zHdXNwEERJP88C+H2I6qJHXwdlTS4="; + sha256 = "sha256-MJybc2yAchU6qMqkoRz45QdhR7bj/UFk2nyxcBivsHI="; }; - patches = [ - # Introduces a wallpaper meson flag. - # The wallpapaper path does not exist on NixOS, let's just remove the wallpaper. - # https://github.com/elementary/switchboard-plug-about/pull/236 - ./add-wallpaper-option.patch - ]; - nativeBuildInputs = [ meson ninja @@ -48,12 +43,14 @@ stdenv.mkDerivation rec { gtk3 libgee libgtop + libgudev libhandy switchboard + udisks2 ]; mesonFlags = [ - # This option is introduced in add-wallpaper-option.patch + # Does not play nice with the nix-snowflake logo "-Dwallpaper=false" ]; diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/development/guile-modules/guile-json/default.nix index dee81f2baebd..81febc3171b7 100644 --- a/pkgs/development/guile-modules/guile-json/default.nix +++ b/pkgs/development/guile-modules/guile-json/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "guile-json"; - version = "4.7.2"; + version = "4.7.3"; src = fetchurl { url = "mirror://savannah/guile-json/${pname}-${version}.tar.gz"; - sha256 = "sha256-lCq37FtAhWeZwMqfuBkhrxf8Q2CuvvHMjLH2rZIg1Rk="; + sha256 = "sha256-OLoEjtKdEvBbMsWy+3pReVxEi0HkA6Kxty/wA1gX84g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 4fd4c0c130f0..0344559f8a8f 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,26 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, itk_5_2, python3, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, itk, Cocoa }: stdenv.mkDerivation rec { pname = "elastix"; - version = "5.0.1"; + version = "5.1.0"; src = fetchFromGitHub { - owner = "SuperElastix"; - repo = pname; - rev = version; - sha256 = "1mx8kkak2d3ibfrxrh8jkmh2zkdlgl9h578wiw3617zcwaa97bxw"; + owner = "SuperElastix"; + repo = pname; + rev = version; + hash = "sha256-wFeLU8IwiF43a9TAvecQG+QMw88PQZdJ8sI1Zz3ZeXc="; }; - patches = [ - (fetchpatch { - name = "install-executables.patch"; # https://github.com/SuperElastix/elastix/issues/305 - url = "https://github.com/SuperElastix/elastix/commit/8e26cdc0d66f6030c7be085fdc424d84d4fc7546.patch"; - sha256 = "12y9wbpi9jlarnw6fk4iby97jxvx5g4daq9zqblbcmn51r134bj5"; - }) - ]; - - nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ itk_5_2 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ itk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; doCheck = !stdenv.isDarwin; # usual dynamic linker issues diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 571e4e717d8f..9f04cee3869a 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-e5u9+H4rILIDpnZxzVV9wbjhR9tRqnf11i2Kn39DTzo="; + sha256 = "sha256-gIRfmCCkDokUhBKsQnWx8jQtfoYBgY65IS+tdmgeaYE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 3cda67bce4f3..9d03d193d81c 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch2 , meson , ninja , pkg-config @@ -28,7 +27,7 @@ }: let - generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "", patches ? [ ] }: + generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "" }: stdenv.mkDerivation rec { pname = "wlroots"; inherit version; @@ -41,7 +40,6 @@ let inherit hash; }; - inherit patches; postPatch = extraPatch; # $out for the library and $examples for the example programs (in examples): @@ -131,13 +129,6 @@ rec { substituteInPlace backend/drm/meson.build \ --replace /usr/share/hwdata/ ${hwdata}/share/hwdata/ ''; - patches = [ - (fetchpatch2 { - # render/egl: fix uninitialized pointers in init_dmabuf_formats - url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/ed71915742160f2b9157adbad79364e22ab7ebda.patch"; - hash = "sha256-nNE+mBfLG3Q8PC3ly8GZXQZcoIoBLbcet7nxip6Ut0w="; - }) - ]; }; wlroots = wlroots_0_15; diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix index d0894d5ceeb5..f1a7c049d832 100644 --- a/pkgs/development/mobile/maestro/default.nix +++ b/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.21.0"; + version = "1.21.2"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "13b2ykphc7szdanlkk34agf7p0lx78mavk5pjfls48d1k5hllslc"; + sha256 = "1pd38izpwr19929pmqqqw9cvyf1sqzcmrywr7cyn9q8saxs97z8z"; }; dontUnpack = true; diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix index 76e2a2bfa323..9fa7a378b56e 100644 --- a/pkgs/development/python-modules/chex/default.nix +++ b/pkgs/development/python-modules/chex/default.nix @@ -42,6 +42,12 @@ buildPythonPackage rec { disabledTests = [ # See https://github.com/deepmind/chex/issues/204. "test_uninspected_checks" + + # These tests started failing at some point after upgrading to 0.1.5 + "test_useful_failure" + "TreeAssertionsTest" + "PmapFakeTest" + "WithDeviceTest" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index e83e3464ad5d..285e90c22526 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -1,28 +1,30 @@ { lib , buildPythonPackage -, fetchPypi , certifi -, six +, fetchPypi , python-dateutil +, pythonOlder +, six , urllib3 }: buildPythonPackage rec { pname = "cloudsmith-api"; - version = "2.0.0"; - + version = "2.0.1"; format = "wheel"; + disabled = pythonOlder "3.7"; + src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - sha256 = "sha256-Mcdpmrjg5hX4BTlBgt2+jQaoCqWjNIqkBykl1iT7McA="; + hash = "sha256-wFSHlUdZTARsAV3igVXThrXoGsPUaZyzXBJCSJFZYYQ="; }; propagatedBuildInputs = [ certifi - six python-dateutil + six urllib3 ]; diff --git a/pkgs/development/python-modules/gemfileparser2/default.nix b/pkgs/development/python-modules/gemfileparser2/default.nix new file mode 100644 index 000000000000..f6a2c0877bfd --- /dev/null +++ b/pkgs/development/python-modules/gemfileparser2/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "gemfileparser2"; + version = "0.9.3"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-BFKJZOf0W2b0YNbKIwnrmoKGvtP8A6R9PrUt7kYC/Dk="; + }; + + dontConfigure = true; + + nativeBuildInputs = [ + setuptools-scm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "gemfileparser2" + ]; + + meta = with lib; { + description = "Library to parse Rubygem gemspec and Gemfile files"; + homepage = "https://github.com/nexB/gemfileparser2"; + changelog = "https://github.com/nexB/gemfileparser2/blob/v${version}/CHANGELOG.rst"; + license = with licenses; [ mit /* or */ gpl3Plus ]; + maintainers = with maintainers; [ harvidsen ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index a7e22c11b4f7..7aaa53d39cf1 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.18.0"; + version = "2.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RncpEPcNeCZdpeevSEeTmu1L6m4qZO/huZPAxoazrxY="; + hash = "sha256-XNPeWe8nYGmJr/MVxt0uBZMf0N2QEp5hYge0RJRWUqA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 2c6a9d4ea8f9..f92580db80b9 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.14.1"; + version = "2.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-A40lbmMijD0d1B81n2bcJ43gGaRYkVfmquOO8usRXew="; + hash = "sha256-idnWz7o7RuOAZbY+H5STVAVa1rexThDY3Zb5eaI10Ao="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index b707887bc392..0ada1ee5d865 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.35.0"; + version = "1.36.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-kewhNnbCmciywTkk/NTBqO02jN8IAW/MriH/DkhQkFU="; + hash = "sha256-RHcUkIYzshJr6r76Kq4FsjDl9YXZJOaCeijBwMTvPfw="; }; propagatedBuildInputs = [ @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "InfluxDB client library"; homepage = "https://github.com/influxdata/influxdb-client-python"; + changelog = "https://github.com/influxdata/influxdb-client-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix index 2d8348bfc9bc..e826fd9d2cd5 100644 --- a/pkgs/development/tools/analysis/bingrep/default.nix +++ b/pkgs/development/tools/analysis/bingrep/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bingrep"; - version = "0.9.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "m4b"; repo = pname; rev = "v${version}"; - hash = "sha256-M3BYj1SKQKjEqP9cxaVlh7UeleDbcx6JN+UI6Ez+QJ8="; + hash = "sha256-Uzkz4KEFOf4XdcfkjQm8OQRenUX9jDxTJaRivfIy0ak="; }; - cargoHash = "sha256-botAoLNg/qTh+cjPXcjo/Ol2Vktj/c5130k5falEuLY="; + cargoHash = "sha256-NbZ9E3vUiDDKyEHZfgS8ErxXhQSTTsoPA/g+kGxCbXc="; meta = with lib; { description = "Greps through binaries from various OSs and architectures, and colors them"; diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 62026d527810..6cf84434cdec 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/spin --prefix PATH : ${binPath} + + mkdir -p $out/share/spin + cp $src/optional_gui/ispin.tcl $out/share/spin + makeWrapper $out/share/spin/ispin.tcl $out/bin/ispin \ + --prefix PATH : $out/bin:${binPath} ''; meta = with lib; { diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/development/tools/cloudsmith-cli/default.nix index 46e2a7801f69..f08d020f4191 100644 --- a/pkgs/development/tools/cloudsmith-cli/default.nix +++ b/pkgs/development/tools/cloudsmith-cli/default.nix @@ -1,17 +1,16 @@ -{ python3 -, lib +{ lib +, python3 }: python3.pkgs.buildPythonApplication rec { pname = "cloudsmith-cli"; - version = "0.32.0"; - + version = "0.35.2"; format = "wheel"; src = python3.pkgs.fetchPypi { pname = "cloudsmith_cli"; inherit format version; - sha256 = "ZETVtRlzd9KUOeDyAH0MnnIy1WtGLVBm+bActUM4zBw="; + hash = "sha256-+M4CPveS9dltMI291Atm84T/cf4dPOO3wPvPI15E73Y="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -33,11 +32,16 @@ python3.pkgs.buildPythonApplication rec { # Wheels have no tests doCheck = false; - meta = { + pythonImportsCheck = [ + "cloudsmith_cli" + ]; + + meta = with lib; { homepage = "https://help.cloudsmith.io/docs/cli/"; description = "Cloudsmith Command Line Interface"; - maintainers = with lib.maintainers; [ jtojnar ]; - license = lib.licenses.asl20; - platforms = with lib.platforms; unix; + changelog = "https://github.com/cloudsmith-io/cloudsmith-cli/blob/v${version}/CHANGELOG.md"; + maintainers = with maintainers; [ jtojnar ]; + license = licenses.asl20; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index 91ad0b3ee907..9e5dc5628ba7 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dagger"; - version = "0.3.9"; + version = "0.3.10"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - hash = "sha256-tq3b/4ysGG7fozIou1cvWs+BJSe9rPDYKaV2GT3hLGE="; + hash = "sha256-/JbKnDjC3C0mF4WHOmmvblrr/e1MhOws3Q/oXZCgdEM="; }; - vendorHash = "sha256-8FjzL++AFNhHvk9ipeVK3tmPMEgTKg8Fz/vJZMEAPJE="; + vendorHash = "sha256-wufztmiOwgY0Q6x9oMrJo28JGx8iprC1gr9zZjSWwuw="; proxyVendor = true; subPackages = [ diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index c77cf7833dd7..ddc8f596c72b 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.12.09-15.51.10"; + version = "2023.01.26-11.08.16"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-hWDTxYtL0c9zkJDle9/XNPMwDDCltfAnz/Os83xL3iM="; + sha256 = "sha256-1dbeS9yF+qjmwDyfELQhlEyAI5B8092Lg0SwqvqXPgc="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "df8e000a69fc2aaa85312952f27a9b79625928d825acfe1da69cb67d220ada33"; + sha256 = "7fe2f384233d5101483803f72d995b75cf3587eae10dc954989018c2accf711b"; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 551ec1cb1464..72aa21aa9c76 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.235"; + version = "0.0.236"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pa1q2OY9jwWktcQVmk8EQjb3WUtPb7SFecQ16A+3C6c="; + sha256 = "sha256-2JV0isbVkpEt6bsLdTbII9LjtvdGB22ZDSpf7bj6dto="; }; - cargoSha256 = "sha256-gYyVa615ujV5xuiC3bhscje9sP43iQV8WolClcF372Q="; + cargoSha256 = "sha256-cjMz3L24CRk1Qoz7sapk3EKtFfm8Uto+jtLy71rDGvQ="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 4a1cbf08c534..1aaa752fbd6e 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -1,9 +1,11 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , ninja , pkg-config +, rustPlatform , curl , freetype , libGLU @@ -22,6 +24,7 @@ , vulkan-loader , glslang , spirv-tools +, gtest , Carbon , Cocoa , OpenGL @@ -30,16 +33,33 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "16.5"; + version = "16.7.2"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - sha256 = "sha256-fHe72ew+qoSyOqXU9Hs9EyecrYDjEqTm+Ii9Zja9up4="; + hash = "sha256-dK46ubcq/sYSXLeZwAeomj9+jpSNpgHsTmXKdrllLTc="; }; - nativeBuildInputs = [ cmake ninja pkg-config ]; + cargoDeps = rustPlatform.fetchCargoTarball { + name = "${pname}-${version}"; + inherit src; + hash = "sha256-jLR/XriiKXmpHGBHtPa1vpE5ms3Dw1wrNt/4KARyM74="; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + rustPlatform.rust.rustc + rustPlatform.rust.cargo + rustPlatform.cargoSetupHook + ]; + + nativeCheckInputs = [ + gtest + ]; buildInputs = [ curl @@ -62,8 +82,13 @@ stdenv.mkDerivation rec { spirv-tools ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa OpenGL Security ]; - cmakeFlags = [ - "-DAUTOUPDATE=OFF" + patches = [ + (fetchpatch { + # error: use of undeclared identifier 'pthread_attr_set_qos_class_np' + # https://github.com/ddnet/ddnet/pull/5913 + url = "https://github.com/ddnet/ddnet/pull/5913/commits/ccc6cd59de58905dce3a3bd5d8461a03b1adb249.patch"; + hash = "sha256-CkHckE+bOMKDcoijNYDo+zEQ9Eq9ePDV18LybzCMPYs="; + }) ]; postPatch = '' @@ -71,6 +96,13 @@ stdenv.mkDerivation rec { --replace /usr/ $out/ ''; + cmakeFlags = [ + "-DAUTOUPDATE=OFF" + ]; + + doCheck = true; + checkTarget = "run_tests"; + meta = with lib; { description = "A Teeworlds modification with a unique cooperative gameplay."; longDescription = '' @@ -82,9 +114,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://ddnet.org"; license = licenses.asl20; - maintainers = with maintainers; [ sirseruju lom ]; + maintainers = with maintainers; [ sirseruju lom ncfavier ]; mainProgram = "DDNet"; - # error: use of undeclared identifier 'pthread_attr_set_qos_class_np' - broken = stdenv.isDarwin; }; } diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix index 505c76f38f94..40b06d88269b 100644 --- a/pkgs/games/ecwolf/default.nix +++ b/pkgs/games/ecwolf/default.nix @@ -11,7 +11,7 @@ , SDL2 , SDL2_net , SDL2_mixer -, gtk2 +, gtk3 }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake copyDesktopItems pkg-config ]; - buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk2 ]; + buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk3 ]; desktopItems = [ (makeDesktopItem { @@ -61,11 +61,12 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; description = "Enhanched SDL-based port of Wolfenstein 3D for various platforms"; homepage = "https://maniacsvault.net/ecwolf/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; platforms = platforms.all; + # On Darwin, the linker fails to find a bunch of symbols. + broken = stdenv.isDarwin; }; } diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index 1c3f3342e081..100b51e301f9 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "forkstat"; - version = "0.02.17"; + version = "0.03.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-Rw1Xwst0+seksTLL+v3IUEojGjwCERwF89xkk70npUU="; + hash = "sha256-hxheElo/v23Xt7m6GvDgGdyIH+fC4eZSUztiuBbQ8T8="; }; installFlags = [ diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index 46a633aec55a..588c99b5a339 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { pname = "libtracefs"; - version = "1.5.0"; + version = "1.6.4"; src = fetchgit { url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; rev = "libtracefs-${version}"; - sha256 = "sha256-5OUTOIla4adtSJwQkii6f/mB99R5QzodyQkq/g6oNSw="; + sha256 = "sha256-fWop0EMkoVulLBzU7q8x1IhMtdnEJ89wMz0cz964F6s="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 02111abb4d04..df9aca8e2461 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -51,14 +51,14 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "525.47.04"; - persistencedVersion = "525.78.01"; - settingsVersion = "525.78.01"; - sha256_64bit = "sha256-PcDRM39s4vh5++4TocIJKI3wsxWxJdy3p3KAenpdIc0="; - openSha256 = "sha256-jH7mwSpasOdWMvN1xuPkO33g0XJjObzA45aqHwKoD4w="; - settingsSha256 = "sha256-1d3Cn+7Gm1ORQxmTKr18GFmYHVb8t050XVLler1dCtw="; - persistencedSha256 = "sha256-t6dViuvA2fw28w4kh4koIoxh9pQ8f7KI1PIUFJcGlYA="; - url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; + version = "525.47.06"; + persistencedVersion = "525.85.05"; + settingsVersion = "525.85.05"; + sha256_64bit = "sha256-HxRXtd3ubjS1V/y1hDWe16XNSCbQYHoEw+Jz8Emy5/4="; + openSha256 = "sha256-oiOlCdkFMXm4vVZzmnnI5/INVWUqC02gGj/aIfzjGig="; + settingsSha256 = "sha256-ck6ra8y8nn5kA3L9/VcRR2W2RaWvfVbgBiOh2dRJr/8="; + persistencedSha256 = "sha256-dt/Tqxp7ZfnbLel9BavjWDoEdLJvdJRwFjTFOBYYKLI="; + url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; }; # Update note: diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 0aff1bdd789d..f408e6a95056 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,18 +1,19 @@ { lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight }: stdenv.mkDerivation rec { pname = "trace-cmd"; - version = "3.1.2"; + version = "3.1.6"; src = fetchgit { url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"; rev = "trace-cmd-v${version}"; - sha256 = "sha256-wxrMEE7ZgMHM59Rv6Gk3f0zdpULuXLnY0UY797YF1a0="; + sha256 = "sha256-qjfeomeExjsx/6XrUaGm5szbL7XVlekGd4Hsuncv8NY="; }; # Don't build and install html documentation postPatch = '' sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' \ Documentation{,/trace-cmd,/libtracecmd}/Makefile + patchShebangs check-manpages.sh ''; nativeBuildInputs = [ asciidoc libxslt pkg-config xmlto docbook_xsl docbook_xml_dtd_45 sourceHighlight ]; diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 0a76b4303b29..0e8fc3292589 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { pname = "pulumi"; - version = "3.52.0"; + version = "3.53.1"; # Used in pulumi-language packages, which inherit this prop sdkVendorHash = "sha256-y45TlQF8jJeDLeKEI+ZMcEQqwUIrHPjgTaz1QkjTlEI="; @@ -23,12 +23,12 @@ buildGoModule rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-UxVIk7LMF7h/Ba09EgkIuna5iAfqKEuzU0qSKJRPpfw="; + hash = "sha256-5+NwhrALKqyaX6uj1d3Dp3CXWif5/mkL1QgT4pN29bw="; # Some tests rely on checkout directory name name = "pulumi"; }; - vendorSha256 = "sha256-tr3sp9b9xh5NLK1AO88QQVzYbIysmmgRW2s1IRNHFUI="; + vendorSha256 = "sha256-GoRPXbgQqix8FQxQx5oxzeV3+Rfzc02GniGnJS5HJWE="; sourceRoot = "${src.name}/pkg"; diff --git a/pkgs/tools/misc/edir/default.nix b/pkgs/tools/misc/edir/default.nix index 7cd621be76a8..8bfeae8586ae 100644 --- a/pkgs/tools/misc/edir/default.nix +++ b/pkgs/tools/misc/edir/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "edir"; - version = "2.7.3"; + version = "2.16"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "06nsy9ikljc437368l38hsw75whacn3j6jwmdgg766q61pnifhkp"; + sha256 = "ro1GZkJ6xDZcMRaWTAW/a2qhFbZAxsduvGO3C4sOI+A="; }; meta = with lib; { diff --git a/pkgs/tools/misc/uair/default.nix b/pkgs/tools/misc/uair/default.nix new file mode 100644 index 000000000000..cdada5e4697f --- /dev/null +++ b/pkgs/tools/misc/uair/default.nix @@ -0,0 +1,37 @@ +{ fetchFromGitHub +, installShellFiles +, lib +, rustPlatform +, scdoc +}: + +rustPlatform.buildRustPackage rec { + pname = "uair"; + version = "v0.4.0"; + + src = fetchFromGitHub { + owner = "metent"; + repo = pname; + rev = version; + hash = "sha256-xGPc371Dfo455rnfacXVDgC9SXU5s8jqw4ttSCBqWyk="; + }; + + cargoHash = "sha256-tHcMR8ExIlzYZzacBYyyk2d5by20jG4ihM0yU0K6Xhg="; + + nativeBuildInputs = [ installShellFiles scdoc ]; + + preFixup = '' + scdoc < docs/uair.1.scd > docs/uair.1 + scdoc < docs/uair.5.scd > docs/uair.5 + scdoc < docs/uairctl.1.scd > docs/uairctl.1 + + installManPage docs/*.[1-9] + ''; + + meta = with lib; { + description = "An extensible pomodoro timer"; + homepage = "https://github.com/metent/uair"; + license = licenses.mit; + maintainers = with maintainers; [ thled ]; + }; +} diff --git a/pkgs/tools/text/mdbook-open-on-gh/default.nix b/pkgs/tools/text/mdbook-open-on-gh/default.nix index f334645ba5a4..ea7fd3a22e70 100644 --- a/pkgs/tools/text/mdbook-open-on-gh/default.nix +++ b/pkgs/tools/text/mdbook-open-on-gh/default.nix @@ -1,26 +1,17 @@ -{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "mdbook-open-on-gh"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "badboy"; repo = pname; - rev = "2.2.0"; - hash = "sha256-x7ESuXoF5dYnJZpgDyYliVixCG4w/VX/Vhm3VqxsiEI="; + rev = version; + hash = "sha256-omQTyJ7XKRBjX8jyWLONajAYnwr93nElrwDLdvs2MxM="; }; - cargoPatches = [ - # https://github.com/badboy/mdbook-open-on-gh/pull/7 - (fetchpatch { - name = "update-mdbook-for-rust-1.64.patch"; - url = "https://github.com/badboy/mdbook-open-on-gh/commit/bd20601bfcec144c9302b1ba1a1aff4b95b334d9.patch"; - hash = "sha256-3Df9Q3sqCpZzqCN9fi+wdeWjLUW4XdywIS3QUjsDE9g="; - }) - ]; - - cargoHash = "sha256-N0RwengTWk4luPIecIxzbFReGi+PtE77FJalPq1CdbA="; + cargoHash = "sha256-57KcqALWbiGtp6HWSN42gZ0St38oHu3inZ0TT77j7go="; meta = with lib; { description = "mdbook preprocessor to add a open-on-github link on every page"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cd26a3265c9..aabaf86eac48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3311,6 +3311,8 @@ with pkgs; itd = callPackage ../applications/misc/itd { }; + kord = callPackage ../applications/misc/kord { }; + lastpass-cli = callPackage ../tools/security/lastpass-cli { }; leetcode-cli = callPackage ../applications/misc/leetcode-cli { }; @@ -12720,6 +12722,8 @@ with pkgs; ua = callPackage ../tools/networking/ua { }; + uair = callPackage ../tools/misc/uair { }; + ubidump = python3Packages.callPackage ../tools/filesystems/ubidump { }; ubridge = callPackage ../tools/networking/ubridge { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b28b310f37e0..297acceb5c06 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3710,6 +3710,8 @@ self: super: with self; { gemfileparser = callPackage ../development/python-modules/gemfileparser { }; + gemfileparser2 = callPackage ../development/python-modules/gemfileparser2 { }; + genanki = callPackage ../development/python-modules/genanki { }; generic = callPackage ../development/python-modules/generic { };