diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/audio/pulseaudio-modules-bt/default.nix | 63 | ||||
-rw-r--r-- | pkgs/applications/networking/remote/remmina/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 29 | ||||
-rw-r--r-- | pkgs/development/libraries/log4cplus/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 5 | ||||
-rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 6 | ||||
-rw-r--r-- | pkgs/shells/zsh/default.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
8 files changed, 95 insertions, 28 deletions
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix new file mode 100644 index 00000000000..e3d07fcc245 --- /dev/null +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, runCommand +, fetchFromGitHub +, libpulseaudio +, pulseaudio +, pkgconfig +, libtool +, cmake +, bluez +, dbus +, sbc +}: + +let + pulseSources = runCommand "pulseaudio-sources" {} '' + mkdir $out + tar -xf ${pulseaudio.src} + mv pulseaudio*/* $out/ + ''; + +in stdenv.mkDerivation rec { + name = "pulseaudio-modules-bt-${version}"; + version = "unstable-2018-09-11"; + + src = fetchFromGitHub { + owner = "EHfive"; + repo = "pulseaudio-modules-bt"; + rev = "9c6ad75382f3855916ad2feaa6b40e37356d80cc"; + sha256 = "1iz4m3y6arsvwcyvqc429w252dl3apnhvl1zhyvfxlbg00d2ii0h"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + pkgconfig + cmake + ]; + + buildInputs = [ + libpulseaudio + pulseaudio + libtool + bluez + dbus + sbc + ]; + + NIX_CFLAGS_COMPILE = [ + "-L${pulseaudio}/lib/pulseaudio" + ]; + + prePatch = '' + rm -r pa + ln -s ${pulseSources} pa + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/EHfive/pulseaudio-modules-bt; + description = "SBC, Sony LDAC codec (A2DP Audio) support for Pulseaudio"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ adisbladis ]; + }; +} diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 14ab36c78fd..fb138a1e8d4 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -10,7 +10,7 @@ }: let - version = "1.2.31.3"; + version = "1.2.31.4"; desktopItem = makeDesktopItem { name = "remmina"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "0lvang4587wz292c3k3s8n4icc25cia1phmij34ndrl1f9lg34dp"; + sha256 = "1jx704f5zjns3nqy0ffgyfaxfxcxp83mfm5k539xfnqjn5g5h1qr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 608fb3625b2..b33b29e82ef 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -177,19 +177,22 @@ in package-set { inherit pkgs stdenv callPackage; } self // { callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version); # Creates a Haskell package from a source package by calling cabal2nix on the source. - callCabal2nix = name: src: args: let - filter = path: type: - pkgs.lib.hasSuffix "${name}.cabal" path || - baseNameOf path == "package.yaml"; - expr = self.haskellSrc2nix { - inherit name; - src = if pkgs.lib.canCleanSource src - then pkgs.lib.cleanSourceWith { inherit src filter; } - else src; - }; - in overrideCabal (callPackageKeepDeriver expr args) (orig: { - inherit src; - }); + callCabal2nixWithOptions = name: src: extraCabal2nixOptions: args: + let + filter = path: type: + pkgs.lib.hasSuffix "${name}.cabal" path || + baseNameOf path == "package.yaml"; + expr = self.haskellSrc2nix { + inherit name extraCabal2nixOptions; + src = if pkgs.lib.canCleanSource src + then pkgs.lib.cleanSourceWith { inherit src filter; } + else src; + }; + in overrideCabal (callPackageKeepDeriver expr args) (orig: { + inherit src; + }); + + callCabal2nix = name: src: args: self.callCabal2nixWithOptions name src "" args; # : { root : Path # , source-overrides : Defaulted (Either Path VersionNumber) diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 3fdad73d9fa..7a390021d1f 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - name = "log4cplus-1.2.0"; + name = "log4cplus-2.0.2"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/log4cplus/${name}.tar.bz2"; - sha256 = "1fb3g9l12sps3mv4xjiql2kcvj439mww3skz735y7113cnlcf338"; + sha256 = "0y9yy32lhgrcss8i2gcc9incdy55rcrr16dx051gkia1vdzfkay4"; }; meta = { diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 146e1c27696..6e22de4bcf6 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -10,13 +10,13 @@ assert kernel != null; stdenv.mkDerivation rec { name = "spl-${version}-${kernel.version}"; - version = "0.7.9"; + version = "0.7.10"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; rev = "spl-${version}"; - sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0"; + sha256 = "1jkv6sdrd6yvaqx0jg86fjwnsqyxqb2061k7yrka7iyivgjzpi26"; }; patches = [ ./install_prefix.patch ]; @@ -52,6 +52,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; - broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index e6807f1214c..e7cca579d62 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -158,12 +158,12 @@ in { # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.18"; + # incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.9"; + version = "0.7.10"; - sha256 = "0krpxrvnda2jx6l71xhw9fsksyp2a6h9l9asppac3szsd1n7fp9n"; + sha256 = "1kq35ij29fag77dxq21jf9ghbl4nkyjgc2bxzyry9rawznq542v1"; extraPatches = [ (fetchpatch { diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 100657312da..656414aabfc 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, pcre }: let - version = "5.6"; + version = "5.6.1"; documentation = fetchurl { - url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz"; - sha256 = "1kz57w4l0jank67a2hiz6y5idbff5avwg52zdxx3qnflkjvkn2kx"; + url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; + sha256 = "15j8w1ddfparfnqymx67rycgfdl50xcrnd6p1d6q9n3n0462jjmn"; }; in @@ -14,8 +14,8 @@ stdenv.mkDerivation { name = "zsh-${version}"; src = fetchurl { - url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz"; - sha256 = "1vik7s3q5hvazvgw4jm4b90qlk6zcry0s314xw1liarspkd721g3"; + url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; + sha256 = "1s5kzfbfvixibb1sbzmmlrrx898zqwi5cfmnnq4bhcbx64zparlm"; }; buildInputs = [ ncurses pcre ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cc58a009fb..487fcccb192 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13706,6 +13706,8 @@ with pkgs; bluez5 = callPackage ../os-specific/linux/bluez { }; + pulseaudio-modules-bt = callPackage ../applications/audio/pulseaudio-modules-bt { }; + bluez = bluez5; inherit (python3Packages) bedup; |