diff options
Diffstat (limited to 'pkgs/applications')
10 files changed, 23 insertions, 26 deletions
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 4c2011b5b03..88c35a6223a 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -36,7 +36,7 @@ mkDerivation rec { # https://cgit.kde.org/kdevelop.git/commit/?id=716372ae2e8dff9c51e94d33443536786e4bd85b # required as nixos seems to be unable to find CLANG_BUILTIN_DIR cmakeFlags = [ - "-DCLANG_BUILTIN_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${(builtins.parseDrvName llvmPackages.clang.name).version}/include" + "-DCLANG_BUILTIN_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${lib.getVersion llvmPackages.clang}/include" ]; dontWrapQtApps = true; diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 9dcdf8fd2b0..76a62d1762c 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -3,8 +3,6 @@ let - getDesktopFileName = drvName: (builtins.parseDrvName drvName).name; - # TODO: Should we move this to `lib`? Seems like its would be useful in many cases. extensionOf = filePath: lib.concatStringsSep "." (lib.tail (lib.splitString "." (builtins.baseNameOf filePath))); @@ -15,15 +13,15 @@ let '') icons); mkSweetHome3D = - { name, module, version, src, license, description, desktopName, icons }: + { pname, module, version, src, license, description, desktopName, icons }: stdenv.mkDerivation rec { - inherit name version src description; + inherit pname version src description; exec = stdenv.lib.toLower module; sweethome3dItem = makeDesktopItem { inherit exec desktopName; - name = getDesktopFileName name; - icon = getDesktopFileName name; + name = pname; + icon = pname; comment = description; genericName = "Computer Aided (Interior) Design"; categories = "Application;Graphics;2DGraphics;3DGraphics;"; @@ -49,7 +47,7 @@ let mkdir -p $out/bin cp install/${module}-${version}.jar $out/share/java/. - ${installIcons (getDesktopFileName name) icons} + ${installIcons pname icons} cp "${sweethome3dItem}/share/applications/"* $out/share/applications @@ -74,9 +72,9 @@ let in { application = mkSweetHome3D rec { + pname = stdenv.lib.toLower module + "-application"; version = "6.2"; module = "SweetHome3D"; - name = stdenv.lib.toLower module + "-application-" + version; description = "Design and visualize your future home"; license = stdenv.lib.licenses.gpl2Plus; src = fetchsvn { diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index eef5185aaee..1d3f1a41e16 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -7,20 +7,17 @@ let m: "sweethome3d-" + removeSuffix "libraryeditor" (toLower m) + "-editor"; - sweetName = m: v: sweetExec m + "-" + v; - - getDesktopFileName = drvName: (builtins.parseDrvName drvName).name; mkEditorProject = - { name, module, version, src, license, description, desktopName }: + { pname, module, version, src, license, description, desktopName }: stdenv.mkDerivation rec { application = sweethome3dApp; - inherit name module version src description; + inherit pname module version src description; exec = sweetExec module; editorItem = makeDesktopItem { inherit exec desktopName; - name = getDesktopFileName name; + name = pname; comment = description; genericName = "Computer Aided (Interior) Design"; categories = "Application;Graphics;2DGraphics;3DGraphics;"; @@ -66,7 +63,7 @@ in { textures-editor = mkEditorProject rec { version = "1.5"; module = "TexturesLibraryEditor"; - name = sweetName module version; + pname = module; description = "Easily create SH3T files and edit the properties of the texture images it contain"; license = stdenv.lib.licenses.gpl2Plus; src = fetchcvs { @@ -81,7 +78,7 @@ in { furniture-editor = mkEditorProject rec { version = "1.19"; module = "FurnitureLibraryEditor"; - name = sweetName module version; + pname = module; description = "Quickly create SH3F files and edit the properties of the 3D models it contain"; license = stdenv.lib.licenses.gpl2; src = fetchcvs { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 3ed06717f6a..69061cd0808 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -18,8 +18,10 @@ browser: let wrapper = - { browserName ? browser.browserName or (builtins.parseDrvName browser.name).name - , name ? (browserName + "-" + (builtins.parseDrvName browser.name).version) + { browserName ? browser.browserName or (lib.getName browser) + , name ? browserName + "-" + lib.getVersion browser # TODO delete, it's just for compat + , pname ? lib.getName name + , version ? lib.getVersion name , desktopName ? # browserName with first letter capitalized (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName) , nameSuffix ? "" @@ -83,7 +85,7 @@ let gtk_modules = [ libcanberra-gtk2 ]; in stdenv.mkDerivation { - inherit name; + inherit pname version; desktopItem = makeDesktopItem { name = browserName; diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/applications/networking/instant-messengers/slack/update.sh index e5f79388353..6a15298c4e7 100755 --- a/pkgs/applications/networking/instant-messengers/slack/update.sh +++ b/pkgs/applications/networking/instant-messengers/slack/update.sh @@ -3,7 +3,7 @@ set -eu -o pipefail -oldVersion="$(nix-instantiate --eval -E "with import ./. {}; slack-theme-black.version or (builtins.parseDrvName slack-theme-black.name).version" | tr -d '"')" +oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion slack-theme-black" | tr -d '"')" latestSha="$(curl -L -s https://api.github.com/repos/laCour/slack-night-mode/commits\?sha\=master\&since\=${oldVersion} | jq -r '.[0].sha')" if [ ! "null" = "${latestSha}" ]; then diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh index e0632042493..6214d4e2625 100755 --- a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh +++ b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh @@ -3,7 +3,7 @@ set -eu -o pipefail -oldVersion=$(nix-instantiate --eval -E "with import ./. {}; zoom-us.version or (builtins.parseDrvName zoom-us.name).version" | tr -d '"') +oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion zoom-us" | tr -d '"') version="$(curl -sI https://zoom.us/client/latest/zoom_x86_64.tar.xz | grep -Fi 'Location:' | pcregrep -o1 '/(([0-9]\.?)+)/')" if [ ! "${oldVersion}" = "${version}" ]; then diff --git a/pkgs/applications/version-management/git-and-tools/git/update.sh b/pkgs/applications/version-management/git-and-tools/git/update.sh index 05944014743..1f1a29782ec 100755 --- a/pkgs/applications/version-management/git-and-tools/git/update.sh +++ b/pkgs/applications/version-management/git-and-tools/git/update.sh @@ -3,7 +3,7 @@ set -eu -o pipefail -oldVersion="$(nix-instantiate --eval -E "with import ./. {}; git.version or (builtins.parseDrvName git.name).version" | tr -d '"')" +oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion git" | tr -d '"')" latestTag="$(git ls-remote --tags --sort="v:refname" git://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" if [ ! "${oldVersion}" = "${latestTag}" ]; then diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 7081e1a0899..bf8e5652d99 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -5,7 +5,7 @@ let version = "1.1"; - perlVersion = (builtins.parseDrvName perl.name).version; + perlVersion = stdenv.lib.getVersion perl; in assert perlVersion != ""; diff --git a/pkgs/applications/video/vdr/wrapper.nix b/pkgs/applications/video/vdr/wrapper.nix index 497ad7c77a0..50d3b9d65a8 100644 --- a/pkgs/applications/video/vdr/wrapper.nix +++ b/pkgs/applications/video/vdr/wrapper.nix @@ -8,7 +8,7 @@ in symlinkJoin { - name = "vdr-with-plugins-${(builtins.parseDrvName vdr.name).version}"; + name = "vdr-with-plugins-${lib.getVersion vdr}"; paths = [ vdr ] ++ plugins; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index ecf6f1c5421..846f395671d 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -16,7 +16,7 @@ let else throw "Unsupported architecture"; - version = (builtins.parseDrvName edk2.name).version; + version = lib.getVersion edk2; in edk2.mkDerivation projectDscPath { |