diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/boxfort | |
parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/boxfort')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/boxfort/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/boxfort/default.nix b/nixpkgs/pkgs/development/libraries/boxfort/default.nix index ab2805a15e72..855f86a3c36f 100644 --- a/nixpkgs/pkgs/development/libraries/boxfort/default.nix +++ b/nixpkgs/pkgs/development/libraries/boxfort/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, python3Packages }: stdenv.mkDerivation rec { - version = "unstable-2019-10-09"; pname = "boxfort"; + version = "0.1.4"; src = fetchFromGitHub { owner = "Snaipe"; repo = "BoxFort"; - rev = "356f047db08b7344ea7980576b705e65b9fc8772"; - sha256 = "1p0llz7n0p5gzpvqszmra9p88vnr0j88sp5ixhgbfz89bswg62ss"; + rev = "v${version}"; + sha256 = "jmtWTOkOlqVZ7tFya3IrQjr714Y8TzAVY5Cq+RzDuRs="; }; nativeBuildInputs = [ meson ninja ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchShebangs ci/isdir.py ''; - checkInputs = with python3Packages; [ cram ]; + nativeCheckInputs = with python3Packages; [ cram ]; doCheck = true; @@ -29,7 +29,5 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ thesola10 Yumasi ]; platforms = platforms.unix; - # Upstream currently broken for macOS https://cirrus-ci.com/build/5624937369042944 - broken = stdenv.targetPlatform.isDarwin; }; } |