diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-30 13:30:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 10:13:20 +0000 |
| commit | f2e61678de300336b3666afd19af7565efb0c4cf (patch) | |
| tree | 49f6906c9d557f7fdd58257ff85ec17fc4495f31 /nixpkgs/pkgs/applications/audio/furnace/default.nix | |
| parent | f920d5e07c29a9aa1b77d9b88bd604cf1a1f3664 (diff) | |
| parent | 00e27c78d3d2de6964096ceee8d70e5b487365e3 (diff) | |
| download | nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.gz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.bz2 nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.lz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.xz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.zst nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.zip | |
Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'
Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/audio/furnace/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/audio/furnace/default.nix | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/applications/audio/furnace/default.nix b/nixpkgs/pkgs/applications/audio/furnace/default.nix index e7794175ac91..841a65e541fc 100644 --- a/nixpkgs/pkgs/applications/audio/furnace/default.nix +++ b/nixpkgs/pkgs/applications/audio/furnace/default.nix @@ -1,8 +1,9 @@ { stdenv , lib -, nix-update-script +, gitUpdater +, testVersion +, furnace , fetchFromGitHub -, fetchpatch , cmake , pkg-config , makeWrapper @@ -18,24 +19,16 @@ stdenv.mkDerivation rec { pname = "furnace"; - version = "0.5.6"; + version = "0.5.8"; src = fetchFromGitHub { owner = "tildearrow"; repo = "furnace"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-BcaPQuDFkAaxFQKwoI6xdSWcyHo5VsqZcwf++JISqRs="; + sha256 = "103ymd3wa1sfsr6qg15vpcs53j350i7zidv3azlf7cynk6k28xim"; }; - patches = [ - (fetchpatch { - name = "0001-furnace-fix-wrong-include-path.patch"; - url = "https://github.com/tildearrow/furnace/commit/456db22f9d9f0ed40d74fe50dde492e69e901fcc.patch"; - sha256 = "17ikb1z9ldm7kdj00m4swsrq1qx94vlzhc6h020x3ryzwnglc8d3"; - }) - ]; - postPatch = '' # rtmidi is not used yet sed -i -e '/add_subdirectory(extern\/rtmidi/d' -e '/DEPENDENCIES_LIBRARIES rtmidi/d' CMakeLists.txt @@ -85,8 +78,16 @@ stdenv.mkDerivation rec { cp -r ../demos $out/share/furnace/ ''; - passthru.updateScript = nix-update-script { - attrPath = pname; + passthru = { + updateScript = gitUpdater { + inherit pname version; + rev-prefix = "v"; + }; + tests.version = testVersion { + package = furnace; + # The command always exits with code 1 + command = "(furnace --version || [ $? -eq 1 ])"; + }; }; meta = with lib; { |