diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-11-16 09:49:24 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-11-16 09:49:24 +0100 |
| commit | 0fe5300699182cd6e2d6f6e2459671e6d5ffd69b (patch) | |
| tree | 5e3fca0a82505733a631130889fe9756c5e8b5e5 /pkgs/applications/version-management | |
| parent | 1181aa74bcba03558eb18db93823a70305ddc56d (diff) | |
| parent | 826934df9a5935635740a31afec804d0369c5a66 (diff) | |
| download | nixlib-0fe5300699182cd6e2d6f6e2459671e6d5ffd69b.tar nixlib-0fe5300699182cd6e2d6f6e2459671e6d5ffd69b.tar.gz nixlib-0fe5300699182cd6e2d6f6e2459671e6d5ffd69b.tar.bz2 nixlib-0fe5300699182cd6e2d6f6e2459671e6d5ffd69b.tar.lz nixlib-0fe5300699182cd6e2d6f6e2459671e6d5ffd69b.tar.xz nixlib-0fe5300699182cd6e2d6f6e2459671e6d5ffd69b.tar.zst nixlib-0fe5300699182cd6e2d6f6e2459671e6d5ffd69b.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/pijul/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/version-management/sourcehut/default.nix | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 1ea92e333d5b..63f7bf7fbbe2 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-beta.6"; + version = "1.0.0-beta.7"; src = fetchCrate { inherit version pname; - hash = "sha256-1cIb4QsDYlOCGrQrLgEwIjjHZ3WwD2o0o0bF+OOqEtI="; + hash = "sha256-BXDz9po8i937/xYoIW4S/FddtcWxSmtRUWYIphgh060="; }; - cargoHash = "sha256-mRi0NUETTdYE/oM+Jo7gW/zNby8dPAKl6XhzP0Qzsf0="; + cargoHash = "sha256-+KF1G4bDfcjHHzZR93lIR8muO6s3j5jDobr3A7Arr+Q="; doCheck = false; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index 37840f486dc5..8682057b7838 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -1,4 +1,6 @@ -{ python3 +{ lib +, stdenv +, python3 , callPackage , recurseIntoAttrs , nixosTests @@ -35,7 +37,9 @@ let hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; }; nativeCheckInputs = with super; [ pytestCheckHook mock ]; - disabledTestPaths = []; + disabledTestPaths = [] + # Disable incompatible tests on Darwin. + ++ lib.optionals stdenv.isDarwin [ "test/aaa_profiling" ]; }); flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (oldAttrs: rec { |