diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 821486d55a3d..bf30e3f1e61d 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -570,6 +570,7 @@ with lib.maintainers; { ralith dandellion sumnerevans + nickcao ]; scope = "Maintain the ecosystem around Matrix, a decentralized messenger."; shortName = "Matrix"; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 1e52bd9e02f7..28b5592d9d7d 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -102,7 +102,7 @@ let copy_bin_and_libs () { [ -f "$out/bin/$(basename $1)" ] && rm "$out/bin/$(basename $1)" - cp -pdvH $1 $out/bin + cp -pdv $1 $out/bin } # Copy BusyBox. @@ -122,7 +122,7 @@ let # code, using default options and effectively ignore security relevant # ZFS properties such as `setuid=off` and `exec=off` (unless manually # duplicated in `fileSystems.*.options`, defeating "zfsutil"'s purpose). - copy_bin_and_libs ${pkgs.util-linux}/bin/mount + copy_bin_and_libs ${pkgs.util-linux.mount}/bin/mount copy_bin_and_libs ${pkgs.zfs}/bin/mount.zfs ''} diff --git a/pkgs/applications/audio/roomeqwizard/default.nix b/pkgs/applications/audio/roomeqwizard/default.nix index acb7ae6e43a1..97f9b4f02846 100644 --- a/pkgs/applications/audio/roomeqwizard/default.nix +++ b/pkgs/applications/audio/roomeqwizard/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "roomeqwizard"; - version = "5.20.5"; + version = "5.20.13"; src = fetchurl { - url = "https://www.roomeqwizard.com/installers/REW_linux_${lib.replaceStrings [ "." ] [ "_" ] version}.sh"; - sha256 = "NYTRiOZmwkni4k+jI2SV84z5umO7+l+eKpwPCdlDD3U="; + url = "https://www.roomeqwizard.com/installers/REW_linux_no_jre_${lib.replaceStrings [ "." ] [ "_" ] version}.sh"; + sha256 = "sha256-6zaBDOmQlyMRQ84j64oS7TMwcctT1PSbuQOUYY9QjvY="; }; dontUnpack = true; diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index 93922313ddfd..e70f9521756e 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "transcribe"; - version = "9.21"; + version = "9.25"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { - url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-9.21.0.tar.gz"; - sha256 = "sha256-M0hOJOsTTRxPef8rTO+/KpiP4lr8mtplS9KITaFOFPA="; + url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.0.tar.gz"; + sha256 = "sha256-vgl3BCAC7gOYTviHJzMbgZfHTpP90XUvxpC1IhvEZ8I="; } else throw "Platform not supported"; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 858931058fce..ce51c4284b3f 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.62.2"; + version = "2.64.1"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-Rb611v2QirGmJ01lZj6F3iHLTPI2eJp5acZDEQ4Ude0=="; + hash = "sha256-EdrJcu3xv+Q31ps3pcjfQh+Kf6C/sidGpk2XM8qBEr0="; }; diff --git a/pkgs/applications/graphics/gscreenshot/default.nix b/pkgs/applications/graphics/gscreenshot/default.nix index a5d71d6b9ed6..9cc53a9c521a 100644 --- a/pkgs/applications/graphics/gscreenshot/default.nix +++ b/pkgs/applications/graphics/gscreenshot/default.nix @@ -18,13 +18,13 @@ python3Packages.buildPythonApplication rec { pname = "gscreenshot"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "thenaterhood"; repo = "${pname}"; rev = "v${version}"; - sha256 = "YuISiTUReX9IQpckIgbt03CY7klnog/IeOtfBoQ1DZM="; + sha256 = "sLJ+Fk+ePrmJeSllGd30uEQ/uFDl5CIob//1cDLKZHg="; }; # needed for wrapGAppsHook to function diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index af42c194e6ec..0496bd1c2267 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.33.0"; + version = "0.33.3"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://anytype-release.fra1.cdn.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-lkocuPlUYGFWWEMaz7Q/SWMFIGa2w+jNQ0u5EzcSz7M="; + sha256 = "sha256-3qBd1WgHn/sfEyNRPTX5viMX3lVZPfsG6x7GfNwkL3E="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 407745492bec..01b8cab15768 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "logseq"; - version = "0.9.10"; + version = "0.9.11"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-en8ws0qdMY5j1o8oTkKcIHHQV+kCuQZzQbdFU97qAQE="; + hash = "sha256-4qOXFSbHaoXqTmH6wSGyb6hutda63AxiKnUxJsHBtCg="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/wallust/default.nix b/pkgs/applications/misc/wallust/default.nix index 4755ce24b7d2..b1ea7a7f0da3 100644 --- a/pkgs/applications/misc/wallust/default.nix +++ b/pkgs/applications/misc/wallust/default.nix @@ -4,18 +4,18 @@ let repoUrl = "https://codeberg.org/explosion-mental/wallust"; in rustPlatform.buildRustPackage rec { pname = "wallust"; - version = "2.4.1"; + version = "2.5.0"; src = fetchgit { url = "${repoUrl}.git"; rev = version; - sha256 = "sha256-7zSUyj8Zzk8rsDe7ukPaV02HH7VQ+yjh+wM5TZzJxSA="; + sha256 = "sha256-np03F4XxGFjWfxCKUUIm7Xlp1y9yjzkeb7F2I7dYttA="; }; - cargoSha256 = "sha256-toqt5vqEsflhqFargEcCXrb6ab748mn6k6/RH5d/3RA="; + cargoSha256 = "sha256-yq51LQB53VKjMoNM3f/JzifEHSA69Jso2QYRsaplQfk="; meta = with lib; { - description = "A better pywall"; + description = "A better pywal"; homepage = repoUrl; license = licenses.mit; maintainers = with maintainers; [onemoresuza]; diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 24c123325a17..3e082bf0811e 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -48,13 +48,13 @@ let in stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.19"; + version = "0.9.20"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - hash = "sha256-55ZPqq/tJmF4sNdK72cgjXUWR4YtUfOrpePHn+E9T74="; + hash = "sha256-xLcoysnCPB9+jI5cZokWWIvXM5wo3eXOe/hXfuChBR4="; }; postUnpack = lib.optional cavaSupport '' diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index cdae7b7c552d..ece75ad87257 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "palemoon-bin"; - version = "32.2.1"; + version = "32.3.1"; src = fetchzip { urls = [ @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { "https://rm-us.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" ]; hash = if withGTK3 then - "sha256-brF9ACAG+JM7bk/JarB208f8ihI/1d90l+6e1pHmC20=" + "sha256-1JYaxxkqgg/gLdZ+uGDB5BI0NKjHO4huk0b/M9QFuII=" else - "sha256-205rhW89Jlk4ICraqndTbJ6/88+ZqhtDOIvhFTiEUz0="; + "sha256-p/Lid6Uv3XTEg+43Gke5VLILhzENHoBP6XjGVHy7wCY="; }; preferLocalBuild = true; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 478bed96921d..828af0e7f7b9 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -29,14 +29,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.29.0"; + version = "0.29.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-FTitj43RFCNvSWInXHALyIljfcBBkaq/XI1ZA1k0glk="; + hash = "sha256-C7Km98N/ER+IJ964V+BFkVF8N7uRmraPIpHn8yJtb/Q="; }; goModules = (buildGoModule { diff --git a/pkgs/applications/version-management/gql/default.nix b/pkgs/applications/version-management/gql/default.nix index 481c007c1532..80cb28a09e5b 100644 --- a/pkgs/applications/version-management/gql/default.nix +++ b/pkgs/applications/version-management/gql/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-x6Es8J6qdtCdrs23eQoIDSusOiDH/mLKch14loEhO5k="; + hash = "sha256-d6uncWHq9bLDODFle7xij9YjhpiQPL7mmyFmVxmy8hY="; }; - cargoHash = "sha256-OUMIISLsOAjjIZjMrPYK/cW+n0NbTnuu5Rakvm4LUf4="; + cargoHash = "sha256-jR79xchMpib76oVnpy+UIbcwhDXvDPyl+jWmVPfXVog="; nativeBuildInputs = [ pkg-config @@ -28,11 +28,6 @@ rustPlatform.buildRustPackage rec { zlib ]; - # Cargo.lock is outdated - preConfigure = '' - cargo metadata --offline - ''; - meta = with lib; { description = "A SQL like query language to perform queries on .git files"; homepage = "https://github.com/AmrDeveloper/GQL"; diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix index 2561246a66f9..e386693b22c7 100644 --- a/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -117,10 +117,35 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' # https://web.archive.org/web/20170222224855/http://frank.harvard.edu/~coldwell/toolchain/ # https://web.archive.org/web/20170224235700/http://frank.harvard.edu/~coldwell/toolchain/t-linux.diff + lib.optionalString (targetPlatform != hostPlatform && withoutTargetLibc && enableShared) - (lib.optionalString (!stdenv.targetPlatform.isPower) '' - echo 'libgcc.a: crti.o crtn.o' >> libgcc/Makefile.in - '' + '' - echo 'SHLIB_LC=' >> libgcc/Makefile.in + (let + + # crt{i,n}.o are the first and last (respectively) object file + # linked when producing an executable. Traditionally these + # files are delivered as part of the C library, but on GNU + # systems they are in fact built by GCC. Since libgcc needs to + # build before glibc, we can't wait for them to be copied by + # glibc. At this early pre-glibc stage these files sometimes + # have different names. + crtstuff-ofiles = + if targetPlatform.isPower + then "ecrti.o ecrtn.o ncrti.o ncrtn.o" + else "crti.o crtn.o"; + + # Normally, `SHLIB_LC` is set to `-lc`, which means that + # `libgcc_s.so` cannot be built until `libc.so` is available. + # The assignment below clobbers this variable, removing the + # `-lc`. + # + # On PowerPC we add `-mnewlib`, which means "libc has not been + # built yet". This causes libgcc's Makefile to use the + # gcc-built `{e,n}crt{n,i}.o` instead of failing to find the + # versions which have been repackaged in libc as `crt{n,i}.o` + # + SHLIB_LC = lib.optionalString targetPlatform.isPower "-mnewlib"; + + in '' + echo 'libgcc.a: ${crtstuff-ofiles}' >> libgcc/Makefile.in + echo 'SHLIB_LC=${SHLIB_LC}' >> libgcc/Makefile.in '') + lib.optionalString (!enableMultilib && hostPlatform.is64bit && !hostPlatform.isMips64n32) '' diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index a26bab92d756..e619732f329d 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.23.0"; + version = "0.23.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fWe/nnI8ugKGOvuwvH8ufvfkhQr3y1PldyYzsvJ5yLw="; + hash = "sha256-EVhzVzgShqFbQvZD4KEw+sDWE473DMM1HyDj2okMxuk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index 8af6dbc643b7..1aae1c347e32 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.2.3"; + version = "6.2.5"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; rev = "refs/tags/v${version}"; - hash = "sha256-AL8dkN3qTriiyGp/359uKy5aOMr9XPSSBw388VvUXYI="; + hash = "sha256-El2hRY+ELzdW/Bv34JURsisRr74MEv19sFt9tWFHIes="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/grad-cam/default.nix b/pkgs/development/python-modules/grad-cam/default.nix index bdfa8c0e49c0..8636a71ecdce 100644 --- a/pkgs/development/python-modules/grad-cam/default.nix +++ b/pkgs/development/python-modules/grad-cam/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "grad-cam"; - version = "1.4.6"; + version = "1.4.8"; disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-sL4+UUfC60JWAgJPvXeVGUHAskuoceVYwYDrYlibUOE="; + hash = "sha256-BNcwDaEEmRsEoJ4nvvGfjZ9LdG0eRqZCFuY5/Gmp5N4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mkdocs-redirects/default.nix b/pkgs/development/python-modules/mkdocs-redirects/default.nix index 9a428f158e6c..878117c6b60a 100644 --- a/pkgs/development/python-modules/mkdocs-redirects/default.nix +++ b/pkgs/development/python-modules/mkdocs-redirects/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mkdocs-redirects"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "mkdocs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+Ti+Z5gL5vVlQDt+KRw9nNHHKhRtEfguQe1K001DK9E="; + hash = "sha256-zv/tCsC2wrD0iH7Kvlq4nXJMPMGQ7+l68Y/q/x66LBg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix index bcc5cbbef946..4fa46defe2cb 100644 --- a/pkgs/development/python-modules/tbm-utils/default.nix +++ b/pkgs/development/python-modules/tbm-utils/default.nix @@ -1,37 +1,76 @@ -{ lib +{ stdenv +, lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , attrs , pendulum +, poetry-core , pprintpp +, pytestCheckHook +, pythonRelaxDepsHook , wrapt }: buildPythonPackage rec { pname = "tbm-utils"; version = "2.6.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "1v7pb3yirkhzbv1z5i1qp74vl880f56zvzfj68p08b5jxv64hmr3"; + src = fetchFromGitHub { + owner = "thebigmunch"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-AEKawsAxDSDNkIaXEFFgdEBOY2PpASDrhlDrsnM5eyA="; }; - propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ]; - - # this versioning was done to prevent normal pip users from encountering - # issues with package failing to build from source, but nixpkgs is better postPatch = '' - substituteInPlace setup.py \ - --replace "'attrs>=18.2,<19.4'" "'attrs'" + substituteInPlace pyproject.toml \ + --replace 'poetry>=1.0.0' 'poetry-core' \ + --replace 'poetry.masonry.api' 'poetry.core.masonry.api' ''; - # No tests in archive. - doCheck = false; + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + attrs + pendulum + pprintpp + wrapt + ]; + + pythonRelaxDeps = [ + "attrs" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = lib.optionals stdenv.isDarwin [ + # Skip on macOS because /etc/localtime is accessed through the pendulum + # library, which is not allowed in a sandboxed build. + "test_create_parser_filter_dates" + "test_parse_args" + ]; + + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # Skip on macOS because /etc/localtime is accessed through the pendulum + # library, which is not allowed in a sandboxed build. + "tests/test_datetime.py" + "tests/test_misc.py" + ]; + + pythonImportsCheck = [ + "tbm_utils" + ]; meta = { description = "A commonly-used set of utilities"; homepage = "https://github.com/thebigmunch/tbm-utils"; - license = with lib.licenses; [ mit ]; + changelog = "https://github.com/thebigmunch/tbm-utils/blob/${version}/CHANGELOG.md"; + license = [ lib.licenses.mit ]; }; - } diff --git a/pkgs/development/tools/language-servers/crystalline/default.nix b/pkgs/development/tools/language-servers/crystalline/default.nix index 8de4ae808779..67ecfdcb7fb8 100644 --- a/pkgs/development/tools/language-servers/crystalline/default.nix +++ b/pkgs/development/tools/language-servers/crystalline/default.nix @@ -7,7 +7,7 @@ }: let - version = "0.9.0"; + version = "0.10.0"; in crystal.buildCrystalPackage { pname = "crystalline"; @@ -17,7 +17,7 @@ crystal.buildCrystalPackage { owner = "elbywan"; repo = "crystalline"; rev = "v${version}"; - sha256 = "sha256-kx3rdGqIbrOaHY7V3uXLqIFEYzzsMKzNwZ6Neq8zM3c="; + hash = "sha256-g4k/vP7yYbTAy2bTAfr6HQhkskWfI6Zv2lxP+AZf6yw="; }; format = "crystal"; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 80e19af292d3..4b2020c0b211 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -5,12 +5,12 @@ buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "5.3.0"; + version = "5.4.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; - hash = "sha256-vp497rmOXSjxvLLZhHwE0ohfwH7VjM2LCKpLZijNZNI="; + hash = "sha256-8SFd4TOGf+/bFuJ5iiJe4ERkaaV0Yq8N7r3SLSqNO5Q="; }; nativeBuildInputs = [ menhir ]; diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index 99cdc2513748..e3c1fdc110b9 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-DcitynM43TuTGWiB8TlGuiO1ZBxyvOhxiOhuwSGIreY="; + hash = "sha256-fwxiqUCdWEf6tjL4z92aN7zrwIXGz6OgXwPcEXd3x4k="; }; - cargoHash = "sha256-PlIKVRqd1xyZbE34d4uzsM+YrYNOr9C24epRs4AePgE="; + cargoHash = "sha256-uBUl5oileUANyKJeoEtBtDSMHZM7e6I4r/0sVelNCeg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/games/minesweep-rs/default.nix b/pkgs/games/minesweep-rs/default.nix index 40e17f5ab889..8aa3ecdc5893 100644 --- a/pkgs/games/minesweep-rs/default.nix +++ b/pkgs/games/minesweep-rs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "minesweep-rs"; - version = "6.0.14"; + version = "6.0.16"; src = fetchFromGitHub { owner = "cpcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-+2HwjdbjzhUQPcBMY2Km/cjGAw4TgjNpNMgtuxVUZD4="; + hash = "sha256-jA4NqLZw+JREj0UlEMjcatb6PeBHpiNKrFenpe3HyBw="; }; - cargoHash = "sha256-Qip+Yc/i57BOaKBOC60j7TDM1rzIEivYFjsp+vQ3hS4="; + cargoHash = "sha256-wvN7aa4LjvYIJZtUedAscD2x8EKpdtzc5b1YI9MTeLY="; meta = with lib; { description = "Sweep some mines for fun, and probably not for profit"; diff --git a/pkgs/games/srb2kart/default.nix b/pkgs/games/srb2kart/default.nix index cb68125addaa..441ffd284a0d 100644 --- a/pkgs/games/srb2kart/default.nix +++ b/pkgs/games/srb2kart/default.nix @@ -16,22 +16,22 @@ let -release_tag = "v1.3"; + release_tag = "v1.6"; -installer = fetchurl { - url = "https://github.com/STJr/Kart-Public/releases/download/${release_tag}/srb2kart-v13-Installer.exe"; - sha256 = "0bk36y7wf6xfdg6j0b8qvk8671hagikzdp5nlfqg478zrj0qf6cs"; -}; + assets = fetchurl { + url = "https://github.com/STJr/Kart-Public/releases/download/${release_tag}/AssetsLinuxOnly.zip"; + sha256 = "sha256-ejhPuZ1C8M9B0S4+2HN1T5pbormT1eVL3nlivqOszdE="; + }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "srb2kart"; - version = "1.3.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "STJr"; repo = "Kart-Public"; rev = release_tag; - sha256 = "131g9bmc9ihvz0klsc3yzd0pnkhx3mz1vzm8y7nrrsgdz5278y49"; + sha256 = "sha256-5sIHdeenWZjczyYM2q+F8Y1SyLqL+y77yxYDUM3dVA0="; }; nativeBuildInputs = [ @@ -50,7 +50,6 @@ in stdenv.mkDerivation rec { ]; cmakeFlags = [ - #"-DSRB2_ASSET_DIRECTORY=/build/source/assets" "-DGME_INCLUDE_DIR=${game-music-emu}/include" "-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2" "-DSDL2_INCLUDE_DIR=${lib.getDev SDL2}/include/SDL2" @@ -68,7 +67,7 @@ in stdenv.mkDerivation rec { preConfigure = '' mkdir assets/installer pushd assets/installer - unzip ${installer} "*.kart" srb2.srb + unzip ${assets} "*.kart" srb2.srb popd ''; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 1c244664975b..677cc9363da4 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -373,11 +373,20 @@ stdenv.mkDerivation ({ # Remove reference to kmod sed -i Makefile -e 's|= ${buildPackages.kmod}/bin/depmod|= depmod|' + '' + # unfortunately linux/arch/mips/Makefile does not understand installkernel + # and simply copies to $(INSTALL_PATH)/vmlinux-$(KERNELRELEASE) + + lib.optionalString stdenv.hostPlatform.isMips '' + mv $out/vmlinux-* $out/vmlinux || true + mv $out/vmlinuz-* $out/vmlinuz || true + mv $out/System.map-* $out/System.map ''; preFixup = '' # Don't strip $dev/lib/modules/*/vmlinux stripDebugList="$(cd $dev && echo lib/modules/*/build/*/)" + '' + lib.optionalString (stdenv.hostPlatform.isMips) '' + $STRIP -s $out/vmlinux || true ''; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index e0d20c772e0c..9f7867065ea8 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -152,8 +152,8 @@ stdenv.mkDerivation rec { platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "x86_64-linux" "m68k-linux" - "microblaze-linux" "microblazeel-linux" "mipsel-linux" - "mips64el-linux" "powerpc64-linux" "powerpc64le-linux" + "microblaze-linux" "microblazeel-linux" "mips-linux" "mips64-linux" + "mipsel-linux" "mips64el-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "s390x-linux" ]; maintainers = with maintainers; [ thoughtpolice dtzWill ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 692cc8dfd6b0..2dda7228e791 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -18,6 +18,8 @@ let else a; in rec { + mkDriver = generic; + # Official Unix Drivers - https://www.nvidia.com/en-us/drivers/unix/ # Branch/Maturity data - http://people.freedesktop.org/~aplattner/nvidia-versions.txt diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 489f015c5b46..136cf1c755f7 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,28 +1,39 @@ { lib , buildGoModule , fetchFromGitHub +, fetchpatch , fetchurl , nixosTests }: buildGoModule rec { pname = "mattermost"; - version = "7.10.2"; + version = "7.10.3"; src = fetchFromGitHub { owner = "mattermost"; - repo = "mattermost-server"; + repo = "mattermost"; rev = "v${version}"; - hash = "sha256-gccWFcG+Jc/77nN9hiV/2gUcY5w0IzOktykbGgafBD0="; + hash = "sha256-nzQUkcCFEZYvqMLRv1d81pfoz/MDYjWetGLtFXf8H/Q="; }; webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - hash = "sha256-T2lyg4BtArx813kk6edQ7AX3ZmA7cTsrJuWs7k6WYPU="; + hash = "sha256-oD67sTyTvB0DVcw3e6x79Y4K8xlX75YreRwnc9olTy4="; }; vendorHash = "sha256-7YxbBmkKeb20a3BNllB3RtvjAJLZzoC2OBK4l1Ud1bw="; + patches = [ + (fetchpatch { + # Current version was set to 7.10.4 in the v7.10.3 tag, reverting it so `mattermost version` exposes the correct version + # and to make smoke tests happy + url = "https://github.com/mattermost/mattermost/commit/fbdadeacc85ae47145f69ffb766d4105aede69d5.patch"; + hash = "sha256-9BNEc5VefRuPKb3/rQNiekNbAIBRsjAtdCKUVrh9BuY="; + revert = true; + }) + ]; + subPackages = [ "cmd/mattermost" ]; ldflags = [ diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index ad2689d5d217..46bb3c8d522d 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -136,7 +136,7 @@ let pkgs.pkgsCross.arm-embedded.stdenv pkgs.pkgsCross.m68k.stdenv pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc - #pkgs.pkgsCross.powernv.pkgsBuildTarget.gcc + pkgs.pkgsCross.powernv.pkgsBuildTarget.gcc pkgs.pkgsCross.mips64el-linux-gnuabi64.stdenv pkgs.pkgsCross.mips64el-linux-gnuabin32.stdenv pkgs.pkgsCross.mingwW64.stdenv diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index c2500300d995..ed647cc98863 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -57,11 +57,13 @@ python3Packages.buildPythonApplication rec { passthru.tests.version = testers.testVersion { package = borgmatic; }; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Simple, configuration-driven backup software for servers and workstations"; homepage = "https://torsion.org/borgmatic/"; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ imlonghao ]; }; } diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index e6383ca46feb..baab57c400d8 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "minio-client"; - version = "2023-07-07T05-25-51Z"; + version = "2023-07-11T23-30-44Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-r++4DQFqFjhTfNBRG/4qr2AeQAWKdJu8mzv6uYGovLk="; + sha256 = "sha256-hCHPDzdMqu36fICiyVhMDHhfOHxBzUl5+YfjnWbrRFk="; }; vendorHash = "sha256-W3FenwPwfEQxJWym6QzqMczWtygPN65Hp4gjj/karMw="; diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/tools/networking/stevenblack-blocklist/default.nix index 43fcc2401566..8a71f6d99fd4 100644 --- a/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ b/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "3.11.19"; + version = "3.13.10"; in fetchFromGitHub { name = "stevenblack-blocklist-${version}"; @@ -9,7 +9,7 @@ fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; rev = version; - sha256 = "sha256-YGD3I64g/zD5iX2oIU6Qy/WqzcWcaNs1HjMUBeKcDZ4="; + sha256 = "sha256-LTo0NV1DpHI05AvfmTKNz+/NdXaNoLxgpMhV/HqeT6g="; meta = with lib; { description = "Unified hosts file with base extensions"; diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix index 865f0d6a538b..5beb23d424a8 100644 --- a/pkgs/tools/security/fulcio/default.nix +++ b/pkgs/tools/security/fulcio/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fulcio"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sDOsnpxvPTlexZFDEbF7kOl/1h/Xl3/ziBII95Oxqsw="; + sha256 = "sha256-HJ1hTq6Mwt4f8r92ZNpL/Aco9dzIpxBH9ZSA3h1P4/A="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/tools/wayland/swww/default.nix b/pkgs/tools/wayland/swww/default.nix index 34b43347afbf..2bd2dbcf7e38 100644 --- a/pkgs/tools/wayland/swww/default.nix +++ b/pkgs/tools/wayland/swww/default.nix @@ -1,16 +1,16 @@ { config, lib, pkgs, fetchFromGitHub, rustPlatform, pkg-config, lz4, libxkbcommon }: rustPlatform.buildRustPackage rec { pname = "swww"; - version = "0.7.3"; + version = "0.8.1"; src = fetchFromGitHub { owner = "Horus645"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-58zUi6tftTvNoc/R/HO4RDC7n+NODKOrBCHH8QntKSY="; + hash = "sha256-9c/qBmk//NpfvPYjK2QscubFneiQYBU/7PLtTvVRmTA="; }; - cargoSha256 = "sha256-hL5rOf0G+UBO8kyRXA1TqMCta00jGSZtF7n8ibjGi9k="; + cargoSha256 = "sha256-AE9bQtW5r1cjIsXA7YEP8TR94wBjaM7emOroVFq9ldE="; buildInputs = [ lz4 libxkbcommon ]; doCheck = false; # Integration tests do not work in sandbox environment nativeBuildInputs = [ pkg-config ];