diff options
author | Felix Buehler <account@buehler.rocks> | 2021-11-09 16:09:14 +0100 |
---|---|---|
committer | Felix Buehler <account@buehler.rocks> | 2021-11-09 22:24:57 +0100 |
commit | 9480444dae9d35419e4d06777f8ca2f6013d6984 (patch) | |
tree | 7f3b0838ab7932164f7eb396428ff4a3e0d4a701 /pkgs/os-specific | |
parent | 77ca4df050e7ebd49838645fcab05bcce87d02f3 (diff) | |
download | nixpkgs-9480444dae9d35419e4d06777f8ca2f6013d6984.tar nixpkgs-9480444dae9d35419e4d06777f8ca2f6013d6984.tar.gz nixpkgs-9480444dae9d35419e4d06777f8ca2f6013d6984.tar.bz2 nixpkgs-9480444dae9d35419e4d06777f8ca2f6013d6984.tar.lz nixpkgs-9480444dae9d35419e4d06777f8ca2f6013d6984.tar.xz nixpkgs-9480444dae9d35419e4d06777f8ca2f6013d6984.tar.zst nixpkgs-9480444dae9d35419e4d06777f8ca2f6013d6984.zip |
treewide: rename name to pname&version
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/darwin/DarwinTools/default.nix | 5 | ||||
-rw-r--r-- | pkgs/os-specific/darwin/insert_dylib/default.nix | 36 | ||||
-rw-r--r-- | pkgs/os-specific/darwin/maloader/default.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/fbterm/default.nix | 21 | ||||
-rw-r--r-- | pkgs/os-specific/linux/mwprocapture/default.nix | 14 | ||||
-rw-r--r-- | pkgs/os-specific/linux/seturgent/default.nix | 16 | ||||
-rw-r--r-- | pkgs/os-specific/linux/udisks-glue/default.nix | 11 | ||||
-rw-r--r-- | pkgs/os-specific/linux/udisks/1-default.nix | 48 | ||||
-rw-r--r-- | pkgs/os-specific/windows/jom/default.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/windows/mingwrt/default.nix | 5 | ||||
-rw-r--r-- | pkgs/os-specific/windows/w32api/default.nix | 5 | ||||
-rw-r--r-- | pkgs/os-specific/windows/wxMSW-2.8/default.nix | 9 |
12 files changed, 110 insertions, 66 deletions
diff --git a/pkgs/os-specific/darwin/DarwinTools/default.nix b/pkgs/os-specific/darwin/DarwinTools/default.nix index 588769c7bfc..f648435eed2 100644 --- a/pkgs/os-specific/darwin/DarwinTools/default.nix +++ b/pkgs/os-specific/darwin/DarwinTools/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "DarwinTools-1"; + pname = "DarwinTools"; + version = "1"; src = fetchurl { - url = "https://opensource.apple.com/tarballs/DarwinTools/${name}.tar.gz"; + url = "https://opensource.apple.com/tarballs/DarwinTools/DarwinTools-${version}.tar.gz"; sha256 = "0hh4jl590jv3v830p77r3jcrnpndy7p2b8ajai3ldpnx2913jfhp"; }; diff --git a/pkgs/os-specific/darwin/insert_dylib/default.nix b/pkgs/os-specific/darwin/insert_dylib/default.nix index 07e8886e3e6..7ab9692f0d4 100644 --- a/pkgs/os-specific/darwin/insert_dylib/default.nix +++ b/pkgs/os-specific/darwin/insert_dylib/default.nix @@ -1,18 +1,22 @@ { lib, stdenv, fetchFromGitHub, xcbuildHook }: -stdenv.mkDerivation - { name = "insert_dylib-2016.08.28"; - src = fetchFromGitHub - { owner = "Tyilo"; - repo = "insert_dylib"; - rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9"; - sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya"; - }; - nativeBuildInputs = [ xcbuildHook ]; - installPhase = - '' - mkdir -p $out/bin - install -m755 Products/Release/insert_dylib $out/bin - ''; - meta.platforms = lib.platforms.darwin; - } +stdenv.mkDerivation { + pname = "insert_dylib"; + version = "unstable-2016-08-28"; + + src = fetchFromGitHub { + owner = "Tyilo"; + repo = "insert_dylib"; + rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9"; + sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya"; + }; + + nativeBuildInputs = [ xcbuildHook ]; + + installPhase = '' + mkdir -p $out/bin + install -m755 Products/Release/insert_dylib $out/bin + ''; + + meta.platforms = lib.platforms.darwin; +} diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix index 9142484e043..bcd9fe6488d 100644 --- a/pkgs/os-specific/darwin/maloader/default.nix +++ b/pkgs/os-specific/darwin/maloader/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, opencflite, clang, libcxx }: stdenv.mkDerivation { - name = "maloader-0git"; + pname = "maloader"; + version = "unstable-2014-02-25"; src = fetchgit { url = "git://github.com/shinh/maloader.git"; diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index 72e886b91f5..4fdbb06c521 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -1,19 +1,18 @@ -{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86}: +{ stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86 }: let s = # Generated upstream information - { - baseName="fbterm"; - version="1.7.0"; - name="fbterm-1.7.0"; - hash="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz"; - sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; - }; - buildInputs = [gpm freetype fontconfig ncurses] + { + version = "1.7.0"; + pname = "fbterm"; + hash = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz"; + sha256 = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; + }; + buildInputs = [ gpm freetype fontconfig ncurses ] ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) libx86; in stdenv.mkDerivation { - inherit (s) name version; + inherit (s) pname version; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index ca5b82b8785..769bb1e43b4 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -4,25 +4,25 @@ with lib; let bits = - if stdenv.is64bit then "64" - else "32"; + if stdenv.is64bit then "64" + else "32"; libpath = makeLibraryPath [ stdenv.cc.cc stdenv.glibc alsa-lib ]; in stdenv.mkDerivation rec { - name = "mwprocapture-1.3.0.${version}-${kernel.version}"; - version = "4236"; + pname = "mwprocapture"; + subVersion = "4236"; + version = "1.3.0.${subVersion}-${kernel.version}"; src = fetchurl { - url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz"; + url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${subVersion}.tar.gz"; sha256 = "1mfgj84km276sq5i8dny1vqp2ycqpvgplrmpbqwnk230d0w3qs74"; }; nativeBuildInputs = kernel.moduleBuildDependencies; - preConfigure = - '' + preConfigure = '' cd ./src export INSTALL_MOD_PATH="$out" ''; diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix index 2e9e445eddc..da494f08ca2 100644 --- a/pkgs/os-specific/linux/seturgent/default.nix +++ b/pkgs/os-specific/linux/seturgent/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, libX11, xorgproto, unzip }: stdenv.mkDerivation { - name = "seturgent-2012-08-17"; + pname = "seturgent"; + version = "unstable-2012-08-17"; src = fetchurl { url = "https://github.com/hiltjo/seturgent/archive/ada70dcb15865391e5cdcab27a0739a304a17e03.zip"; @@ -10,7 +11,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ unzip ]; buildInputs = [ - libX11 xorgproto + libX11 + xorgproto ]; installPhase = '' @@ -19,10 +21,10 @@ stdenv.mkDerivation { ''; meta = { - platforms = lib.platforms.linux; - description = "Set an application's urgency hint (or not)"; - maintainers = [ lib.maintainers.yarr ]; - homepage = "https://github.com/hiltjo/seturgent"; - license = lib.licenses.mit; + platforms = lib.platforms.linux; + description = "Set an application's urgency hint (or not)"; + maintainers = [ lib.maintainers.yarr ]; + homepage = "https://github.com/hiltjo/seturgent"; + license = lib.licenses.mit; }; } diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 453df94f8fb..e51a2b1990c 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }: -stdenv.mkDerivation { - name = "udisks-glue-1.3.5"; +stdenv.mkDerivation rec { + pname = "udisks-glue"; + version = "1.3.5"; src = fetchurl { - url = "https://github.com/fernandotcl/udisks-glue/archive/release-1.3.5.tar.gz"; + url = "https://github.com/fernandotcl/udisks-glue/archive/release-${version}.tar.gz"; sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176"; }; @@ -17,9 +18,9 @@ stdenv.mkDerivation { homepage = "https://github.com/fernandotcl/udisks-glue"; description = "A tool to associate udisks events to user-defined actions"; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [pSub]; + maintainers = with lib.maintainers; [ pSub ]; license = lib.licenses.bsd2; broken = true; - hydraPlatforms = []; + hydraPlatforms = [ ]; }; } diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index f20dc6b6076..87da3a29d6c 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -1,12 +1,31 @@ -{ lib, stdenv, fetchurl, pkg-config, sg3_utils, udev, glib, dbus, dbus-glib -, polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm -, libxslt, docbook_xsl, util-linux, libgudev }: +{ lib +, stdenv +, fetchurl +, pkg-config +, sg3_utils +, udev +, glib +, dbus +, dbus-glib +, polkit +, parted +, lvm2 +, libatasmart +, intltool +, libuuid +, mdadm +, libxslt +, docbook_xsl +, util-linux +, libgudev +}: stdenv.mkDerivation rec { - name = "udisks-1.0.5"; + pname = "udisks"; + version = "1.0.5"; src = fetchurl { - url = "https://hal.freedesktop.org/releases/${name}.tar.gz"; + url = "https://hal.freedesktop.org/releases/udisks-${version}.tar.gz"; sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j"; }; @@ -27,8 +46,21 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ sg3_utils udev glib dbus dbus-glib polkit parted libgudev - lvm2 libatasmart intltool libuuid libxslt docbook_xsl + [ + sg3_utils + udev + glib + dbus + dbus-glib + polkit + parted + libgudev + lvm2 + libatasmart + intltool + libuuid + libxslt + docbook_xsl ]; nativeBuildInputs = [ pkg-config ]; @@ -41,6 +73,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2Plus ]; broken = true; - hydraPlatforms = []; + hydraPlatforms = [ ]; }; } diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index f3a953576ec..dfd3f3ff19c 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -4,7 +4,8 @@ # both mingw32 and mingw64. stdenv.mkDerivation { - name = "jom-1.0.11"; + pname = "jom"; + version = "1.0.11"; src = fetchgit { url = "git://gitorious.org/qt-labs/jom.git"; diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix index 4fb92569a47..5bf6951cd43 100644 --- a/pkgs/os-specific/windows/mingwrt/default.nix +++ b/pkgs/os-specific/windows/mingwrt/default.nix @@ -1,10 +1,11 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "mingwrt-5.0.2"; + pname = "mingwrt"; + version = "5.0.2"; src = fetchurl { - url = "mirror://sourceforge/mingw/MinGW/Base/mingwrt/${name}/${name}-mingw32-src.tar.xz"; + url = "mirror://sourceforge/mingw/MinGW/Base/mingwrt/mingwrt-${version}/mingwrt-${version}-mingw32-src.tar.xz"; sha256 = "1vj6f578wcffdmy7zzf7xz1lw57kxjy08j0k1n28f0j4ylrk68vp"; }; diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix index ebc95ecaa7a..99faeeb7a8b 100644 --- a/pkgs/os-specific/windows/w32api/default.nix +++ b/pkgs/os-specific/windows/w32api/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation rec { - name = "w32api-3.17-2"; + pname = "w32api"; + version = "3.17-2"; src = fetchurl { - url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma"; + url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-${lib.versions.majorMinor version}/w32api-${version}-mingw32-src.tar.lzma"; sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb"; }; diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index c4fb7993343..bf1e73f67b9 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }: -stdenv.mkDerivation { - name = "wxMSW-2.8.11"; +stdenv.mkDerivation rec { + pname = "wxMSW"; + version = "2.8.11"; src = fetchurl { - url = "mirror://sourceforge/wxwindows/wxWidgets-2.8.11.tar.gz"; + url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.gz"; sha256 = "0icxd21g18d42n1ygshkpw0jnflm03iqki6r623pb5hhd7fm2ksj"; }; @@ -27,7 +28,7 @@ stdenv.mkDerivation { (cd $out/include && ln -s wx-*/* .) "; - passthru = {inherit compat24 compat26 unicode;}; + passthru = { inherit compat24 compat26 unicode; }; meta = { platforms = lib.platforms.windows; |