diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
| commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
| tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/development/libraries/libsidplayfp | |
| parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
| parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
| download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libsidplayfp')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix index fbfdc0b7ff0d..ba1b003442ff 100644 --- a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , makeFontsConf , nix-update-script , testers @@ -19,14 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-1e1QDSJ8CjLU794saba2auCKko7p2ylrdI0JWhh8Kco="; + hash = "sha256-6Gbujz20EHQ7s9GaPpEPju+WqePjpduJqb5hcrswTm8="; }; outputs = [ @@ -35,26 +34,6 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - patches = [ - # Pull autoconf-2.72 compatibility fix: - # https://github.com/libsidplayfp/libsidplayfp/pull/103 - # Remove when version > 2.5.1 - (fetchpatch { - name = "0001-libsidplayfp-autoconf-2.72-compat.patch"; - url = "https://github.com/libsidplayfp/libsidplayfp/commit/2b1b41beb5099d5697e3f8416d78f27634732a9e.patch"; - hash = "sha256-5Hk202IuHUBow7HnnPr2/ieWFjKDuHLQjQ9mJUML9q8="; - }) - - # Fix --disable-tests logic - # https://github.com/libsidplayfp/libsidplayfp/pull/108 - # Remove when version > 2.5.1 - (fetchpatch { - name = "0002-libsidplayfp-Fix-autoconf-logic-for-tests-option.patch"; - url = "https://github.com/libsidplayfp/libsidplayfp/commit/39dd2893b6186c4932d17b529bb62627b742b742.patch"; - hash = "sha256-ErdfPvu8R81XxdHu2TaV87OpLFlRhJai51QcYUIkUZ4="; - }) - ]; - postPatch = '' patchShebangs . ''; |