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/servers/nas | |
| 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/servers/nas')
| -rw-r--r-- | nixpkgs/pkgs/servers/nas/default.nix | 57 |
1 files changed, 41 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/servers/nas/default.nix b/nixpkgs/pkgs/servers/nas/default.nix index c5dba62c6e7c..d7f71ff185f5 100644 --- a/nixpkgs/pkgs/servers/nas/default.nix +++ b/nixpkgs/pkgs/servers/nas/default.nix @@ -1,18 +1,43 @@ -{ lib, stdenv, fetchurl, imake, bison, flex, gccmakedep -, xorgproto, libXau, libXt, libXext, libXaw, libXpm, xorgcffiles }: - -stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchurl +, bison +, flex +, gccmakedep +, imake +, libXau +, libXaw +, libXext +, libXpm +, libXt +, xorgcffiles +, xorgproto +}: + +stdenv.mkDerivation (finalAttrs: { pname = "nas"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.src.tar.gz"; - sha256 = "17dk0ckm6mp1ajc0cd6bwyi638ynw2f6bhbn7gynrs0wfmiyldng"; + url = "mirror://sourceforge/nas/nas-${finalAttrs.version}.tar.gz"; + hash = "sha256-t4hK+zj+7AOhlr07fpxHuAPIMOzRDXRV6cl+Eiw3lEw="; }; - nativeBuildInputs = [ imake bison flex gccmakedep ]; - - buildInputs = [ xorgproto libXau libXt libXext libXaw libXpm ]; + nativeBuildInputs = [ + bison + flex + gccmakedep + imake + ]; + + buildInputs = [ + libXau + libXaw + libXext + libXpm + libXt + xorgproto + ]; buildFlags = [ "WORLDOPTS=" "World" ]; @@ -20,14 +45,14 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/${xorgcffiles}/* $out - rm -r $out/nix + rm -fr $out/nix ''; - meta = with lib; { - description = "A network transparent, client/server audio transport system"; + meta = { homepage = "http://radscan.com/nas.html"; - license = licenses.mit; + description = "A network transparent, client/server audio transport system"; + license = lib.licenses.mit; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) |